Synced Trainer Memo file with pokeheartgold

include/struct_defs/struct_02090800.h

@@ -7,17 +7,22 @@
 #include "pokemon.h"
 #include "string_template.h"
 
-typedef struct {
-    int heapID;
-    MessageLoader *unk_04;
-    StringTemplate *unk_08;
-    Pokemon *unk_0C;
-    BOOL unk_10;
-    PokemonInfoDisplayStruct_sub1 unk_14;
-    PokemonInfoDisplayStruct_sub1 unk_1C;
-    PokemonInfoDisplayStruct_sub1 unk_24;
-    PokemonInfoDisplayStruct_sub1 unk_2C;
-    PokemonInfoDisplayStruct_sub1 unk_34;
+typedef struct MemoNotepadString {
+    int line;
+    Strbuf *string;
+} MemoNotepadString;
+
+typedef struct PokemonInfoDisplayStruct {
+    enum HeapId heapID;
+    MessageLoader *msgData;
+    StringTemplate *msgFmt;
+    Pokemon *mon;
+    BOOL isMine;
+    MemoNotepadString nature;
+    MemoNotepadString metDateAndLocation;
+    MemoNotepadString characteristic;
+    MemoNotepadString flavorPreference;
+    MemoNotepadString eggWatch;
 } PokemonInfoDisplayStruct;
 
 #endif // POKEPLATINUM_STRUCT_02090800_H

include/unk_02092494.h → include/trainer_memo.h

@@ -1,14 +1,14 @@
-#ifndef POKEPLATINUM_UNK_02092494_H
-#define POKEPLATINUM_UNK_02092494_H
+#ifndef POKEPLATINUM_TRAINER_MEMO_H
+#define POKEPLATINUM_TRAINER_MEMO_H
 
 #include "struct_defs/struct_02090800.h"
 
 #include "pokemon.h"
 #include "trainer_info.h"
 
-PokemonInfoDisplayStruct *sub_02092494(Pokemon *param0, BOOL param1, int heapID);
-void sub_0209282C(PokemonInfoDisplayStruct *param0);
+PokemonInfoDisplayStruct *sub_02092494(Pokemon *mon, BOOL isMine, int heapID);
+void sub_0209282C(PokemonInfoDisplayStruct *infoDisplay);
 void UpdateMonStatusAndTrainerInfo(Pokemon *mon, TrainerInfo *trainerInfo, int sel, int metLocation, int heapID);
 void UpdateBoxMonStatusAndTrainerInfo(BoxPokemon *boxMon, TrainerInfo *trainerInfo, int sel, int metLocation, int heapID);
 
-#endif // POKEPLATINUM_UNK_02092494_H
+#endif // POKEPLATINUM_TRAINER_MEMO_H

platinum.us/main.lsf

@@ -325,7 +325,7 @@ Static main
 	Object main.nef.p/src_applications_pokemon_summary_screen_3d_anim.c.o
 	Object main.nef.p/src_applications_pokemon_summary_screen_subscreen.c.o
 	Object main.nef.p/src_ribbon.c.o
-	Object main.nef.p/src_unk_02092494.c.o
+	Object main.nef.p/src_trainer_memo.c.o
 	Object main.nef.p/src_unk_020933F8.c.o
 	Object main.nef.p/src_unk_02094EDC.c.o
 	Object main.nef.p/src_unk_02095AF0.c.o

src/applications/pokemon_summary_screen/window.c

@@ -24,7 +24,7 @@
 #include "strbuf.h"
 #include "string_template.h"
 #include "text.h"
-#include "unk_02092494.h"
+#include "trainer_memo.h"
 #include "unk_02094EDC.h"
 
 #include "res/text/bank/pokemon_summary_screen.h"
@@ -1098,24 +1098,24 @@ static void PrintTrainerMemo(Window *window, Pokemon *mon, BOOL monOTMatches)
 {
     PokemonInfoDisplayStruct *infoDisplay = sub_02092494(mon, monOTMatches, HEAP_ID_POKEMON_SUMMARY_SCREEN);
 
-    if (infoDisplay->unk_14.unk_04 != NULL) {
-        Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, infoDisplay->unk_14.unk_04, 0, (infoDisplay->unk_14.unk_00 - 1) * 16, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL);
+    if (infoDisplay->nature.string != NULL) {
+        Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, infoDisplay->nature.string, 0, (infoDisplay->nature.line - 1) * 16, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL);
     }
 
-    if (infoDisplay->unk_1C.unk_04 != NULL) {
-        Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, infoDisplay->unk_1C.unk_04, 0, (infoDisplay->unk_1C.unk_00 - 1) * 16, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL);
+    if (infoDisplay->metDateAndLocation.string != NULL) {
+        Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, infoDisplay->metDateAndLocation.string, 0, (infoDisplay->metDateAndLocation.line - 1) * 16, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL);
     }
 
-    if (infoDisplay->unk_24.unk_04 != NULL) {
-        Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, infoDisplay->unk_24.unk_04, 0, (infoDisplay->unk_24.unk_00 - 1) * 16, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL);
+    if (infoDisplay->characteristic.string != NULL) {
+        Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, infoDisplay->characteristic.string, 0, (infoDisplay->characteristic.line - 1) * 16, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL);
     }
 
-    if (infoDisplay->unk_2C.unk_04 != NULL) {
-        Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, infoDisplay->unk_2C.unk_04, 0, (infoDisplay->unk_2C.unk_00 - 1) * 16, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL);
+    if (infoDisplay->flavorPreference.string != NULL) {
+        Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, infoDisplay->flavorPreference.string, 0, (infoDisplay->flavorPreference.line - 1) * 16, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL);
     }
 
-    if (infoDisplay->unk_34.unk_04 != NULL) {
-        Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, infoDisplay->unk_34.unk_04, 0, (infoDisplay->unk_34.unk_00 - 1) * 16, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL);
+    if (infoDisplay->eggWatch.string != NULL) {
+        Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, infoDisplay->eggWatch.string, 0, (infoDisplay->eggWatch.line - 1) * 16, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL);
     }
 
     sub_0209282C(infoDisplay);

src/meson.build

@@ -308,7 +308,7 @@ pokeplatinum_c = files(
     'applications/pokemon_summary_screen/3d_anim.c',
     'applications/pokemon_summary_screen/subscreen.c',
     'ribbon.c',
-    'unk_02092494.c',
+    'trainer_memo.c',
     'unk_020933F8.c',
     'unk_02094EDC.c',
     'unk_02095AF0.c',

src/overlay005/daycare.c

@@ -28,10 +28,10 @@
 #include "strbuf.h"
 #include "string_template.h"
 #include "trainer_info.h"
+#include "trainer_memo.h"
 #include "unk_02017038.h"
 #include "unk_0202CC64.h"
 #include "unk_020559DC.h"
-#include "unk_02092494.h"
 
 #include "res/pokemon/species_egg_moves.h"
 

src/overlay006/npc_trade.c

@@ -17,9 +17,9 @@
 #include "save_player.h"
 #include "strbuf.h"
 #include "trainer_info.h"
+#include "trainer_memo.h"
 #include "unk_0202F180.h"
 #include "unk_020559DC.h"
-#include "unk_02092494.h"
 
 static inline Strbuf *NpcTrade_GetOtName(u32 heapID, u32 npcTradeID);
 static Strbuf *NpcTrade_GetNickname(u32 heapID, u32 npcTradeID);

src/overlay088/ov88_0223B140.c

@@ -65,6 +65,7 @@
 #include "text.h"
 #include "touch_screen.h"
 #include "trainer_info.h"
+#include "trainer_memo.h"
 #include "unk_020131EC.h"
 #include "unk_0202ACE0.h"
 #include "unk_0202CC64.h"
@@ -77,7 +78,6 @@
 #include "unk_02038F8C.h"
 #include "unk_0203909C.h"
 #include "unk_020393C8.h"
-#include "unk_02092494.h"
 #include "unk_02095CD4.h"
 #include "vars_flags.h"
 #include "vram_transfer.h"

src/overlay104/ov104_0222DCE0.c

@@ -29,10 +29,10 @@
 #include "strbuf.h"
 #include "string_template.h"
 #include "trainer_info.h"
+#include "trainer_memo.h"
 #include "unk_0202C858.h"
 #include "unk_02038F8C.h"
 #include "unk_0208C098.h"
-#include "unk_02092494.h"
 
 static const u16 sTrainerClassToObjectID[][2] = {
     { TRAINER_CLASS_TRAINER_CHERYL, OBJ_EVENT_GFX_CHERYL },

src/overlay109/ov109_021D0D80.c

@@ -51,13 +51,13 @@
 #include "text.h"
 #include "touch_pad.h"
 #include "trainer_info.h"
+#include "trainer_memo.h"
 #include "unk_0202419C.h"
 #include "unk_020363E8.h"
 #include "unk_020366A0.h"
 #include "unk_02038ED4.h"
 #include "unk_020393C8.h"
 #include "unk_02073838.h"
-#include "unk_02092494.h"
 #include "unk_0209BDF8.h"
 #include "vram_transfer.h"
 

src/pokemon.c

@@ -54,10 +54,10 @@
 #include "strbuf.h"
 #include "trainer_data.h"
 #include "trainer_info.h"
+#include "trainer_memo.h"
 #include "unk_02015F84.h"
 #include "unk_02017038.h"
 #include "unk_0202C9F4.h"
-#include "unk_02092494.h"
 
 #define FATEFUL_ENCOUNTER_LOCATION 3002
 

src/scrcmd_catching_show.c

@@ -21,9 +21,9 @@
 #include "save_player.h"
 #include "system_flags.h"
 #include "trainer_info.h"
+#include "trainer_memo.h"
 #include "unk_0202EEC0.h"
 #include "unk_0202F180.h"
-#include "unk_02092494.h"
 #include "vars_flags.h"
 
 BOOL ScrCmd_SetClearInCatchingShowFlag(ScriptContext *ctx)

src/scrcmd_mystery_gift.c

@@ -28,6 +28,7 @@
 #include "string_template.h"
 #include "system_vars.h"
 #include "trainer_info.h"
+#include "trainer_memo.h"
 #include "unk_02017038.h"
 #include "unk_0202602C.h"
 #include "unk_0202854C.h"
@@ -36,7 +37,6 @@
 #include "unk_0202D778.h"
 #include "unk_0202F180.h"
 #include "unk_02054884.h"
-#include "unk_02092494.h"
 #include "vars_flags.h"
 
 #include "res/text/bank/mystery_gift_deliveryman.h"