From aea5b883ffef734c9ec50fa6ee101734d8da3c3f Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Sun, 2 Jun 2024 06:31:53 -0400 Subject: [PATCH] Identify Journal struct --- include/field/field_system.h | 2 +- include/overlay006/battle_params.h | 2 +- include/overlay007/struct_ov7_0224D008.h | 2 +- include/overlay081/struct_ov81_021D1610.h | 2 +- include/overlay082/struct_ov82_0223B164.h | 2 +- include/overlay088/struct_ov88_0223C370.h | 2 +- include/overlay104/struct_ov104_02230BE4.h | 2 +- include/struct_decls/struct_0202B628_decl.h | 2 +- include/struct_defs/struct_0203DDFC.h | 2 +- include/struct_defs/struct_0203DE34.h | 2 +- include/struct_defs/struct_0203E0FC.h | 2 +- include/struct_defs/struct_0209C194_1.h | 2 +- include/unk_0202B604.h | 18 ++--- include/unk_0203E880.h | 2 +- include/unk_02049D08.h | 2 +- include/unk_02051D8C.h | 2 +- include/unk_020530C8.h | 2 +- include/unk_020933F8.h | 2 +- src/field_system.c | 2 +- src/overlay065/ov65_0222DCE0.c | 4 +- src/overlay065/ov65_0223648C.c | 4 +- src/overlay066/ov66_0222DDF0.c | 16 ++--- src/overlay081/ov81_021D0D80.c | 2 +- src/overlay088/ov88_0223B140.c | 4 +- src/overlay094/ov94_02242AD0.c | 4 +- src/unk_0202B604.c | 76 ++++++++++----------- src/unk_0203E880.c | 4 +- src/unk_0203F6C4.c | 2 +- src/unk_02049D08.c | 2 +- src/unk_02051D8C.c | 2 +- src/unk_020530C8.c | 10 +-- src/unk_0208BA78.c | 2 +- src/unk_020933F8.c | 6 +- src/unk_02099604.c | 4 +- src/unk_0209C194.c | 2 +- 35 files changed, 99 insertions(+), 99 deletions(-) diff --git a/include/field/field_system.h b/include/field/field_system.h index bbee0c0c20..44e9f8706e 100644 --- a/include/field/field_system.h +++ b/include/field/field_system.h @@ -84,7 +84,7 @@ typedef struct FieldSystem_t { int unk_90; RadarChain *chain; UnkStruct_0207D99C * unk_98; - UnkStruct_0202B628 * unk_9C; + Journal * unk_9C; UnkStruct_ov5_021EF300 * unk_A0; UnkStruct_ov5_021E1608 * unk_A4; UnkStruct_ov5_021EFB30 * unk_A8; diff --git a/include/overlay006/battle_params.h b/include/overlay006/battle_params.h index 8275192042..53cf3ae04a 100644 --- a/include/overlay006/battle_params.h +++ b/include/overlay006/battle_params.h @@ -38,7 +38,7 @@ typedef struct { UnkStruct_0206D140 * unk_10C; BattleParams_sub1 unk_110; UnkStruct_0202CD88 * unk_11C; - UnkStruct_0202B628 * unk_120; + Journal * unk_120; UnkStruct_02027F8C * unk_124; int unk_128; int unk_12C; diff --git a/include/overlay007/struct_ov7_0224D008.h b/include/overlay007/struct_ov7_0224D008.h index 37605d0108..bbcc37cb33 100644 --- a/include/overlay007/struct_ov7_0224D008.h +++ b/include/overlay007/struct_ov7_0224D008.h @@ -38,7 +38,7 @@ typedef struct { TrainerInfo * unk_270; void * unk_274; Options * unk_278; - UnkStruct_0202B628 * unk_27C; + Journal * unk_27C; UnkStruct_0202CD88 * unk_280; SaveData * unk_284; FieldEvents * unk_288; diff --git a/include/overlay081/struct_ov81_021D1610.h b/include/overlay081/struct_ov81_021D1610.h index 19c4c993db..760238f8e1 100644 --- a/include/overlay081/struct_ov81_021D1610.h +++ b/include/overlay081/struct_ov81_021D1610.h @@ -13,7 +13,7 @@ typedef struct { BGL * unk_00; Window unk_04[4]; - UnkStruct_0202B628 * unk_44; + Journal * unk_44; TrainerInfo * unk_48; SaveData * unk_4C; MessageLoader * unk_50; diff --git a/include/overlay082/struct_ov82_0223B164.h b/include/overlay082/struct_ov82_0223B164.h index ed2f296eaa..4552b1e9b9 100644 --- a/include/overlay082/struct_ov82_0223B164.h +++ b/include/overlay082/struct_ov82_0223B164.h @@ -16,7 +16,7 @@ typedef struct { TrainerInfo * unk_10; UnkStruct_0207D3C0 * unk_14; Options * unk_18; - UnkStruct_0202B628 * unk_1C; + Journal * unk_1C; BOOL unk_20; BOOL unk_24; } UnkStruct_ov82_0223B164; diff --git a/include/overlay088/struct_ov88_0223C370.h b/include/overlay088/struct_ov88_0223C370.h index 8fce230a0e..22cef5a686 100644 --- a/include/overlay088/struct_ov88_0223C370.h +++ b/include/overlay088/struct_ov88_0223C370.h @@ -21,7 +21,7 @@ typedef struct { SaveData * unk_10; UnkStruct_0202C878 * unk_14; Options * unk_18; - UnkStruct_0202B628 * unk_1C; + Journal * unk_1C; UnkStruct_0202CD88 * unk_20; PokedexData * unk_24; int unk_28; diff --git a/include/overlay104/struct_ov104_02230BE4.h b/include/overlay104/struct_ov104_02230BE4.h index 50b79db79e..31ceb8797d 100644 --- a/include/overlay104/struct_ov104_02230BE4.h +++ b/include/overlay104/struct_ov104_02230BE4.h @@ -12,7 +12,7 @@ typedef struct { void * unk_00; const Options * unk_04; SaveData * unk_08; - UnkStruct_0202B628 * unk_0C; + Journal * unk_0C; UnkStruct_0207D99C * unk_10; int unk_14; int unk_18; diff --git a/include/struct_decls/struct_0202B628_decl.h b/include/struct_decls/struct_0202B628_decl.h index 9262d0b46e..4670e2c8e0 100644 --- a/include/struct_decls/struct_0202B628_decl.h +++ b/include/struct_decls/struct_0202B628_decl.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_0202B628_DECL_H #define POKEPLATINUM_STRUCT_0202B628_DECL_H -typedef struct UnkStruct_0202B628_t UnkStruct_0202B628; +typedef struct UnkStruct_0202B628_t Journal; #endif // POKEPLATINUM_STRUCT_0202B628_DECL_H diff --git a/include/struct_defs/struct_0203DDFC.h b/include/struct_defs/struct_0203DDFC.h index 6472bb7ae5..0e3280a8b2 100644 --- a/include/struct_defs/struct_0203DDFC.h +++ b/include/struct_defs/struct_0203DDFC.h @@ -7,7 +7,7 @@ typedef struct { UnkStruct_0205C22C * unk_00; - UnkStruct_0202B628 * unk_04; + Journal * unk_04; Options * unk_08; } UnkStruct_0203DDFC; diff --git a/include/struct_defs/struct_0203DE34.h b/include/struct_defs/struct_0203DE34.h index 334005e4ed..1889b26f48 100644 --- a/include/struct_defs/struct_0203DE34.h +++ b/include/struct_defs/struct_0203DE34.h @@ -12,7 +12,7 @@ typedef struct { UnkStruct_0205C22C * unk_04; Options * unk_08; UnkStruct_0202CD88 * unk_0C; - UnkStruct_0202B628 * unk_10; + Journal * unk_10; } UnkStruct_0203DE34; #endif // POKEPLATINUM_STRUCT_0203DE34_H diff --git a/include/struct_defs/struct_0203E0FC.h b/include/struct_defs/struct_0203E0FC.h index 8916a28bd9..8f609a2db1 100644 --- a/include/struct_defs/struct_0203E0FC.h +++ b/include/struct_defs/struct_0203E0FC.h @@ -27,7 +27,7 @@ typedef struct { SaveData * unk_20; Options * unk_24; UnkStruct_0202CD88 * unk_28; - UnkStruct_0202B628 * unk_2C; + Journal * unk_2C; UnkStruct_0207D3C0 * unk_30; int unk_34; int unk_38; diff --git a/include/struct_defs/struct_0209C194_1.h b/include/struct_defs/struct_0209C194_1.h index b070d37a62..0b6a643004 100644 --- a/include/struct_defs/struct_0209C194_1.h +++ b/include/struct_defs/struct_0209C194_1.h @@ -15,7 +15,7 @@ typedef struct { UnkStruct_0205C22C * unk_0C; Options * unk_10; UnkStruct_0202CD88 * unk_14; - UnkStruct_0202B628 * unk_18; + Journal * unk_18; FieldSystem * fieldSystem; } UnkStruct_0209C194_1; diff --git a/include/unk_0202B604.h b/include/unk_0202B604.h index aff84545d2..c7fdbcf3ea 100644 --- a/include/unk_0202B604.h +++ b/include/unk_0202B604.h @@ -7,11 +7,11 @@ #include "savedata.h" int Journal_SaveSize(void); -void Journal_Init(UnkStruct_0202B628 * param0); -UnkStruct_0202B628 * sub_0202B628(SaveData * param0); -UnkStruct_0202B628 * sub_0202B634(UnkStruct_0202B628 * param0, BOOL param1); -BOOL sub_0202B6A4(UnkStruct_0202B628 * param0, BOOL param1); -void sub_0202B758(UnkStruct_0202B628 * param0, void * param1, u8 param2); +void Journal_Init(Journal * param0); +Journal * SaveData_GetJournal(SaveData * param0); +Journal * sub_0202B634(Journal * param0, BOOL param1); +BOOL Journal_CheckOpenOnContinue(Journal * param0, BOOL param1); +void sub_0202B758(Journal * param0, void * param1, u8 param2); void * sub_0202BC58(u16 param0, u32 param1); void * sub_0202BCE4(u32 param0); void * sub_0202BCF0(u32 param0); @@ -54,10 +54,10 @@ void * sub_0202C238(u32 param0); void * sub_0202C244(u32 param0, u32 param1); void * sub_0202C250(const u16 * param0, u8 param1, u32 param2, u32 param3); void * sub_0202C280(int param0, u32 param1, u32 param2); -void sub_0202C2A4(UnkStruct_0202B628 * param0, void * param1, u8 param2, u8 param3); -void sub_0202C5C4(TrainerInfo * param0, UnkStruct_0202B628 * param1, u32 param2, u32 param3, u32 param4); +void sub_0202C2A4(Journal * param0, void * param1, u8 param2, u8 param3); +void sub_0202C5C4(TrainerInfo * param0, Journal * param1, u32 param2, u32 param3, u32 param4); u32 sub_0202C6A4(u32 param0); -void sub_0202C704(UnkStruct_0202B628 * param0, u32 param1, u32 param2); -void sub_0202C720(UnkStruct_0202B628 * param0, u16 param1, u16 param2, u32 param3); +void sub_0202C704(Journal * param0, u32 param1, u32 param2); +void sub_0202C720(Journal * param0, u16 param1, u16 param2, u32 param3); #endif // POKEPLATINUM_UNK_0202B604_H diff --git a/include/unk_0203E880.h b/include/unk_0203E880.h index 43e587ca71..2ff49c02d3 100644 --- a/include/unk_0203E880.h +++ b/include/unk_0203E880.h @@ -36,7 +36,7 @@ u16 sub_0203F304(u16 param0); void sub_0203F310(FieldSystem * fieldSystem); u8 sub_0203F3C8(u16 param0); UnkStruct_0203F478 * sub_0203F478(FieldSystem * fieldSystem, int param1); -void sub_0203F598(FieldSystem * fieldSystem); +void FieldSystem_InitNewGameScripts(FieldSystem * fieldSystem); void sub_0203F5A4(FieldSystem * fieldSystem, u16 param1); BOOL sub_0203F5C0(FieldSystem * fieldSystem, u8 param1); diff --git a/include/unk_02049D08.h b/include/unk_02049D08.h index ce38cb921a..fd3ae17bba 100644 --- a/include/unk_02049D08.h +++ b/include/unk_02049D08.h @@ -30,7 +30,7 @@ void sub_0204A4C8(UnkStruct_0204AFC4 * param0, SaveData * param1); u16 sub_0204A578(UnkStruct_0204AFC4 * param0); BOOL sub_0204A57C(UnkStruct_0204AFC4 * param0); void sub_0204A660(UnkStruct_0204AFC4 * param0, SaveData * param1); -void sub_0204A7A4(UnkStruct_0204AFC4 * param0, SaveData * param1, UnkStruct_0202B628 * param2); +void sub_0204A7A4(UnkStruct_0204AFC4 * param0, SaveData * param1, Journal * param2); void sub_0204A8C8(UnkStruct_0204AFC4 * param0); void sub_0204A97C(UnkStruct_0204AFC4 * param0); u16 sub_0204A9E0(UnkStruct_0204AFC4 * param0, u16 param1); diff --git a/include/unk_02051D8C.h b/include/unk_02051D8C.h index bf69a210bf..6cf6826bc0 100644 --- a/include/unk_02051D8C.h +++ b/include/unk_02051D8C.h @@ -21,7 +21,7 @@ void sub_0205213C(BattleParams * param0, Pokemon * param1, int param2); void sub_02052164(BattleParams * param0, const Party * param1, int param2); void sub_02052184(BattleParams * param0, const TrainerInfo * param1, int param2); void sub_020521A4(BattleParams * param0, const ChatotCry * param1, int param2); -void sub_020521B8(BattleParams * param0, const FieldSystem * fieldSystem, SaveData * param2, int param3, UnkStruct_0202B628 * param4, UnkStruct_0207D99C * param5, UnkStruct_0209C370 * param6); +void sub_020521B8(BattleParams * param0, const FieldSystem * fieldSystem, SaveData * param2, int param3, Journal * param4, UnkStruct_0207D99C * param5, UnkStruct_0209C370 * param6); void sub_02052314(BattleParams * param0, const FieldSystem * fieldSystem); void sub_02052348(BattleParams * param0, const FieldSystem * fieldSystem, int param2); void sub_020524E4(BattleParams * param0, const FieldSystem * fieldSystem, const Party * param2, const u8 * param3); diff --git a/include/unk_020530C8.h b/include/unk_020530C8.h index fbe4d2d3bb..01b37f8cc3 100644 --- a/include/unk_020530C8.h +++ b/include/unk_020530C8.h @@ -10,7 +10,7 @@ void sub_020531A0(FieldSystem * fieldSystem); void FieldSystem_MapChange_UpdateGameData(FieldSystem * fieldSystem, BOOL param1); void FieldSystem_MapChange_UpdateGameDataDistortionWorld(FieldSystem * fieldSystem, BOOL param1); void sub_02053494(FieldSystem * fieldSystem); -void sub_020535CC(FieldSystem * fieldSystem); +void FieldSystem_SetLoadMapFromNewGameTask(FieldSystem * fieldSystem); void sub_02053704(FieldSystem * fieldSystem); void sub_02053808(FieldSystem * fieldSystem); void sub_02053900(TaskManager * param0, const Location * param1); diff --git a/include/unk_020933F8.h b/include/unk_020933F8.h index fc00cfa1de..279f05eee5 100644 --- a/include/unk_020933F8.h +++ b/include/unk_020933F8.h @@ -38,7 +38,7 @@ u32 sub_02094904(UnkStruct_02095C48 * param0); void sub_02094A58(UnkStruct_02095C48 * param0, int param1); BOOL sub_02094B1C(UnkStruct_02095C48 * param0); void sub_02094BB4(UnkStruct_02095C48 * param0, int * param1, int * param2, int * param3, int * param4, int * param5); -void sub_02094C44(UnkStruct_02095C48 * param0, SaveData * param1, u32 param2, UnkStruct_0202B628 * param3); +void sub_02094C44(UnkStruct_02095C48 * param0, SaveData * param1, u32 param2, Journal * param3); u16 sub_02094E98(UnkStruct_02095C48 * param0); u16 sub_02094EA0(u32 param0, u32 * param1); diff --git a/src/field_system.c b/src/field_system.c index 63e1287538..a639e65705 100644 --- a/src/field_system.c +++ b/src/field_system.c @@ -75,7 +75,7 @@ static int FieldSystem_InitContinue (OverlayManager * overlayMan, int * param1) static int FieldSystem_InitNewGame (OverlayManager * overlayMan, int * param1) { sFieldSystem = FieldSystem_Init(overlayMan); - sub_020535CC(sFieldSystem); + FieldSystem_SetLoadMapFromNewGameTask(sFieldSystem); return 1; } diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index 0e43086597..f5fcdfd918 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -3850,9 +3850,9 @@ static BOOL ov65_02231A54 (void) static void ov65_02231A74 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) { void * v0; - UnkStruct_0202B628 * v1; + Journal * v1; - v1 = sub_0202B628(param0->unk_160); + v1 = SaveData_GetJournal(param0->unk_160); v0 = sub_0202C244(54, 29); sub_0202B758(v1, v0, 4); diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c index 25b258c2f7..f95a9d2c1d 100644 --- a/src/overlay065/ov65_0223648C.c +++ b/src/overlay065/ov65_0223648C.c @@ -1619,10 +1619,10 @@ static BOOL ov65_02237A10 (UnkStruct_ov65_022367A8 * param0) static void ov65_02237A24 (UnkStruct_0207DE04 * param0, u32 param1) { void * v0; - UnkStruct_0202B628 * v1; + Journal * v1; UnkStruct_0207E060 * v2; - v1 = sub_0202B628(param0->unk_08); + v1 = SaveData_GetJournal(param0->unk_08); v0 = sub_0202C244(param1, 29); sub_0202B758(v1, v0, 4); diff --git a/src/overlay066/ov66_0222DDF0.c b/src/overlay066/ov66_0222DDF0.c index 85cf77ed87..405529327c 100644 --- a/src/overlay066/ov66_0222DDF0.c +++ b/src/overlay066/ov66_0222DDF0.c @@ -1743,9 +1743,9 @@ void ov66_0222EEF4 (UnkStruct_ov66_0222DFF8 * param0, u32 param1) UnkStruct_ov66_0222E71C * v0; TrainerInfo * v1; void * v2; - UnkStruct_0202B628 * v3; + Journal * v3; - v3 = sub_0202B628(param0->unk_00); + v3 = SaveData_GetJournal(param0->unk_00); v0 = (UnkStruct_ov66_0222E71C *)ov66_0222E374(param0, param1); if (v0 != NULL) { @@ -1763,9 +1763,9 @@ void ov66_0222EF44 (UnkStruct_ov66_0222DFF8 * param0, u32 param1) UnkStruct_ov66_0222E71C * v0; TrainerInfo * v1; void * v2; - UnkStruct_0202B628 * v3; + Journal * v3; - v3 = sub_0202B628(param0->unk_00); + v3 = SaveData_GetJournal(param0->unk_00); v0 = (UnkStruct_ov66_0222E71C *)ov66_0222E374(param0, param1); if (v0 != NULL) { @@ -1782,9 +1782,9 @@ void ov66_0222EF44 (UnkStruct_ov66_0222DFF8 * param0, u32 param1) void ov66_0222EF94 (UnkStruct_ov66_0222DFF8 * param0, enum PlazaMinigame param1) { void * v0; - UnkStruct_0202B628 * v1; + Journal * v1; - v1 = sub_0202B628(param0->unk_00); + v1 = SaveData_GetJournal(param0->unk_00); switch (param1) { case UnkEnum_ov66_022324D0_00: @@ -1815,9 +1815,9 @@ void ov66_0222EF94 (UnkStruct_ov66_0222DFF8 * param0, enum PlazaMinigame param1) void ov66_0222F000 (UnkStruct_ov66_0222DFF8 * param0) { void * v0; - UnkStruct_0202B628 * v1; + Journal * v1; - v1 = sub_0202B628(param0->unk_00); + v1 = SaveData_GetJournal(param0->unk_00); v0 = sub_0202C244(112, 28); sub_0202B758(v1, v0, 4); diff --git a/src/overlay081/ov81_021D0D80.c b/src/overlay081/ov81_021D0D80.c index 9111665397..40aefde9bd 100644 --- a/src/overlay081/ov81_021D0D80.c +++ b/src/overlay081/ov81_021D0D80.c @@ -90,7 +90,7 @@ int ov81_021D0D80 (OverlayManager * param0, int * param1) v0->unk_00 = sub_02018340(42); v0->unk_4C = v1; - v0->unk_44 = sub_0202B628(v1); + v0->unk_44 = SaveData_GetJournal(v1); v0->unk_48 = SaveData_GetTrainerInfo(v1); sub_0208C120(0, 42); diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index 00c3f9fc92..654c6fb773 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -120,7 +120,7 @@ static int ov88_0223CF30(int param0, int param1, UnkStruct_ov88_0223C8AC * param static void ov88_0223CF68(int param0, GraphicElementData * param1, int param2); static int ov88_0223CFF4(u32 * param0, int * param1, GraphicElementData * param2, UnkStruct_ov88_0223C8AC * param3, int param4); static int ov88_0223C800(int param0, Pokemon * param1, u8 * param2, ArchivedSprite * param3); -static void ov88_0223E7F0(UnkStruct_0202B628 * param0, Pokemon * param1); +static void ov88_0223E7F0(Journal * param0, Pokemon * param1); static void ov88_0223D140(ChatotCry * param0); static void ov88_0223E894(UnkStruct_02095E80 * param0); static void ov88_0223E8B4(UnkStruct_02095E80 * param0); @@ -2540,7 +2540,7 @@ static void ov88_0223E694 (Party * param0, Party * param1, int param2, int param Heap_FreeToHeap(v1); } -static void ov88_0223E7F0 (UnkStruct_0202B628 * param0, Pokemon * param1) +static void ov88_0223E7F0 (Journal * param0, Pokemon * param1) { void * v0; TrainerInfo * v1 = CommInfo_TrainerInfo(CommSys_CurNetId() ^ 1); diff --git a/src/overlay094/ov94_02242AD0.c b/src/overlay094/ov94_02242AD0.c index 43e4bddbf7..cca62f27fa 100644 --- a/src/overlay094/ov94_02242AD0.c +++ b/src/overlay094/ov94_02242AD0.c @@ -62,7 +62,7 @@ static void ov94_02242D38(UnkStruct_ov94_0223FD4C * param0); static void ov94_02242D74(UnkStruct_ov94_0223FD4C * param0); static void ov94_02242D84(UnkStruct_ov94_0223FD4C * param0); static void ov94_02242D98(UnkStruct_ov94_0223FD4C * param0); -static void ov94_02243E48(UnkStruct_0202B628 * param0, UnkStruct_ov94_0223BA88 * param1); +static void ov94_02243E48(Journal * param0, UnkStruct_ov94_0223BA88 * param1); static void ov94_0224362C(UnkStruct_ov94_0223FD4C * param0); static void ov94_02243E2C(UnkStruct_0202C878 * param0, UnkStruct_ov94_0223BA88 * param1); static void ov94_02243CE4(UnkStruct_ov94_0223FD4C * param0, Pokemon * param1, int param2); @@ -1396,7 +1396,7 @@ static void ov94_02243E2C (UnkStruct_0202C878 * param0, UnkStruct_ov94_0223BA88 sub_02038FDC(param0, param1->unk_11E, param1->unk_11F, param1->unk_123); } -static void ov94_02243E48 (UnkStruct_0202B628 * param0, UnkStruct_ov94_0223BA88 * param1) +static void ov94_02243E48 (Journal * param0, UnkStruct_ov94_0223BA88 * param1) { void * v0; u16 v1[10 + 1]; diff --git a/src/unk_0202B604.c b/src/unk_0202B604.c index 81a4ebac09..372c8a63d0 100644 --- a/src/unk_0202B604.c +++ b/src/unk_0202B604.c @@ -25,7 +25,7 @@ typedef struct UnkStruct_0202B628_t { UnkStruct_0202BE38 unk_14; UnkStruct_0202BF4C unk_18; u8 unk_1C[2][42]; -} UnkStruct_0202B628; +} Journal; typedef struct { u32 unk_00; @@ -38,13 +38,13 @@ typedef struct { u16 unk_06; } UnkStruct_020E5B50; -static void sub_0202B7A0(UnkStruct_0202B628 * param0, UnkStruct_0202BC58 * param1); -static void sub_0202B7E0(UnkStruct_0202B628 * param0, UnkStruct_0202BCC8 * param1); -static void sub_0202B880(UnkStruct_0202B628 * param0, UnkStruct_0202BE38 * param1); -static void sub_0202B88C(UnkStruct_0202B628 * param0, UnkStruct_0202BF4C * param1); -static void sub_0202B898(UnkStruct_0202B628 * param0, UnkStruct_0202BFCC * param1); +static void sub_0202B7A0(Journal * param0, UnkStruct_0202BC58 * param1); +static void sub_0202B7E0(Journal * param0, UnkStruct_0202BCC8 * param1); +static void sub_0202B880(Journal * param0, UnkStruct_0202BE38 * param1); +static void sub_0202B88C(Journal * param0, UnkStruct_0202BF4C * param1); +static void sub_0202B898(Journal * param0, UnkStruct_0202BFCC * param1); static u32 * sub_0202B91C(u32 * param0); -static u8 * sub_0202B954(UnkStruct_0202B628 * param0); +static u8 * sub_0202B954(Journal * param0); static void sub_0202B994(u32 * param0, UnkStruct_0202BCC8 * param1); static void sub_0202B9D0(u32 * param0, UnkStruct_0202BCC8 * param1); static void sub_0202B9F0(u32 * param0, UnkStruct_0202BCC8 * param1); @@ -55,14 +55,14 @@ static void sub_0202BB40(u32 * param0, UnkStruct_0202BCC8 * param1); static void sub_0202BB88(u8 * param0, UnkStruct_0202BFCC * param1); static void sub_0202BBC4(u8 * param0, UnkStruct_0202BFCC * param1); static void sub_0202BBE0(u8 * param0, UnkStruct_0202BFCC * param1); -static void sub_0202BC14(UnkStruct_0202B628 * param0, UnkStruct_0202BFCC * param1); +static void sub_0202BC14(Journal * param0, UnkStruct_0202BFCC * param1); static void sub_0202BC48(u8 * param0, UnkStruct_0202BFCC * param1); static void sub_0202BF94(const u16 * param0, u16 * param1, u32 param2); -static void sub_0202C2FC(UnkStruct_0202B628 * param0, UnkStruct_0202BC58 * param1); -static void sub_0202C304(UnkStruct_0202B628 * param0, UnkStruct_0202BCC8 * param1); -static void sub_0202C3B8(UnkStruct_0202B628 * param0, UnkStruct_0202BE38 * param1); -static void sub_0202C3C4(UnkStruct_0202B628 * param0, UnkStruct_0202BF4C * param1); -static void sub_0202C3D0(UnkStruct_0202B628 * param0, UnkStruct_0202BFCC * param1); +static void sub_0202C2FC(Journal * param0, UnkStruct_0202BC58 * param1); +static void sub_0202C304(Journal * param0, UnkStruct_0202BCC8 * param1); +static void sub_0202C3B8(Journal * param0, UnkStruct_0202BE38 * param1); +static void sub_0202C3C4(Journal * param0, UnkStruct_0202BF4C * param1); +static void sub_0202C3D0(Journal * param0, UnkStruct_0202BFCC * param1); static void sub_0202C474(u32 param0, UnkStruct_0202BCC8 * param1); static void sub_0202C47C(u32 param0, UnkStruct_0202BCC8 * param1); static void sub_0202C494(u32 param0, UnkStruct_0202BCC8 * param1); @@ -119,25 +119,25 @@ static const UnkStruct_020E5B50 Unk_020E5B50[] = { int Journal_SaveSize (void) { - return sizeof(UnkStruct_0202B628) * 10; + return sizeof(Journal) * 10; } -static void sub_0202B60C (UnkStruct_0202B628 * param0) +static void sub_0202B60C (Journal * param0) { - memset(param0, 0, sizeof(UnkStruct_0202B628)); + memset(param0, 0, sizeof(Journal)); } -void Journal_Init (UnkStruct_0202B628 * param0) +void Journal_Init (Journal * param0) { - memset(param0, 0, sizeof(UnkStruct_0202B628) * 10); + memset(param0, 0, sizeof(Journal) * 10); } -UnkStruct_0202B628 * sub_0202B628 (SaveData * param0) +Journal * SaveData_GetJournal (SaveData * param0) { return SaveData_SaveTable(param0, 18); } -UnkStruct_0202B628 * sub_0202B634 (UnkStruct_0202B628 * param0, BOOL param1) +Journal * sub_0202B634 (Journal * param0, BOOL param1) { RTCDate v0; s32 v1; @@ -159,7 +159,7 @@ UnkStruct_0202B628 * sub_0202B634 (UnkStruct_0202B628 * param0, BOOL param1) return ¶m0[0]; } -BOOL sub_0202B6A4 (UnkStruct_0202B628 * param0, BOOL param1) +BOOL Journal_CheckOpenOnContinue (Journal * param0, BOOL param1) { RTCDate v0; RTCDate v1; @@ -195,7 +195,7 @@ BOOL sub_0202B6A4 (UnkStruct_0202B628 * param0, BOOL param1) return 0; } -void sub_0202B758 (UnkStruct_0202B628 * param0, void * param1, u8 param2) +void sub_0202B758 (Journal * param0, void * param1, u8 param2) { if (param0 != NULL) { switch (param2) { @@ -220,7 +220,7 @@ void sub_0202B758 (UnkStruct_0202B628 * param0, void * param1, u8 param2) Heap_FreeToHeap(param1); } -static void sub_0202B7A0 (UnkStruct_0202B628 * param0, UnkStruct_0202BC58 * param1) +static void sub_0202B7A0 (Journal * param0, UnkStruct_0202BC58 * param1) { if ((param0->unk_00.unk_00_0 == param1->unk_00_0) && (param0->unk_00.unk_00_7 == param1->unk_00_7) && (param0->unk_00.unk_00_14 == param1->unk_00_14) && (param0->unk_00.unk_00_11 == param1->unk_00_11)) { return; @@ -229,7 +229,7 @@ static void sub_0202B7A0 (UnkStruct_0202B628 * param0, UnkStruct_0202BC58 * para param0->unk_00 = *param1; } -static void sub_0202B7E0 (UnkStruct_0202B628 * param0, UnkStruct_0202BCC8 * param1) +static void sub_0202B7E0 (Journal * param0, UnkStruct_0202BCC8 * param1) { switch (param1->unk_00) { case 1: @@ -288,17 +288,17 @@ static void sub_0202B7E0 (UnkStruct_0202B628 * param0, UnkStruct_0202BCC8 * para } } -static void sub_0202B880 (UnkStruct_0202B628 * param0, UnkStruct_0202BE38 * param1) +static void sub_0202B880 (Journal * param0, UnkStruct_0202BE38 * param1) { param0->unk_14 = *param1; } -static void sub_0202B88C (UnkStruct_0202B628 * param0, UnkStruct_0202BF4C * param1) +static void sub_0202B88C (Journal * param0, UnkStruct_0202BF4C * param1) { param0->unk_18 = *param1; } -static void sub_0202B898 (UnkStruct_0202B628 * param0, UnkStruct_0202BFCC * param1) +static void sub_0202B898 (Journal * param0, UnkStruct_0202BFCC * param1) { u8 * v0 = sub_0202B954(param0); @@ -364,7 +364,7 @@ static u32 * sub_0202B91C (u32 * param0) return ¶m0[v0]; } -static u8 * sub_0202B954 (UnkStruct_0202B628 * param0) +static u8 * sub_0202B954 (Journal * param0) { u32 v0; @@ -547,7 +547,7 @@ static void sub_0202BBE0 (u8 * param0, UnkStruct_0202BFCC * param1) sub_0202BF94(param1->unk_22, (u16 *)¶m0[18], 12); } -static void sub_0202BC14 (UnkStruct_0202B628 * param0, UnkStruct_0202BFCC * param1) +static void sub_0202BC14 (Journal * param0, UnkStruct_0202BFCC * param1) { u32 v0; u8 * v1; @@ -1061,7 +1061,7 @@ void * sub_0202C280 (int param0, u32 param1, u32 param2) return v0; } -void sub_0202C2A4 (UnkStruct_0202B628 * param0, void * param1, u8 param2, u8 param3) +void sub_0202C2A4 (Journal * param0, void * param1, u8 param2, u8 param3) { switch (param2) { case 0: @@ -1082,12 +1082,12 @@ void sub_0202C2A4 (UnkStruct_0202B628 * param0, void * param1, u8 param2, u8 par } } -static void sub_0202C2FC (UnkStruct_0202B628 * param0, UnkStruct_0202BC58 * param1) +static void sub_0202C2FC (Journal * param0, UnkStruct_0202BC58 * param1) { *param1 = param0->unk_00; } -static void sub_0202C304 (UnkStruct_0202B628 * param0, UnkStruct_0202BCC8 * param1) +static void sub_0202C304 (Journal * param0, UnkStruct_0202BCC8 * param1) { u32 v0; @@ -1148,17 +1148,17 @@ static void sub_0202C304 (UnkStruct_0202B628 * param0, UnkStruct_0202BCC8 * para } } -static void sub_0202C3B8 (UnkStruct_0202B628 * param0, UnkStruct_0202BE38 * param1) +static void sub_0202C3B8 (Journal * param0, UnkStruct_0202BE38 * param1) { *param1 = param0->unk_14; } -static void sub_0202C3C4 (UnkStruct_0202B628 * param0, UnkStruct_0202BF4C * param1) +static void sub_0202C3C4 (Journal * param0, UnkStruct_0202BF4C * param1) { *param1 = param0->unk_18; } -static void sub_0202C3D0 (UnkStruct_0202B628 * param0, UnkStruct_0202BFCC * param1) +static void sub_0202C3D0 (Journal * param0, UnkStruct_0202BFCC * param1) { u32 v0; @@ -1279,7 +1279,7 @@ static void sub_0202C5AC (u8 * param0, UnkStruct_0202BFCC * param1) param1->unk_01_0 = param0[1]; } -void sub_0202C5C4 (TrainerInfo * param0, UnkStruct_0202B628 * param1, u32 param2, u32 param3, u32 param4) +void sub_0202C5C4 (TrainerInfo * param0, Journal * param1, u32 param2, u32 param3, u32 param4) { void * v0; u32 v1; @@ -1355,13 +1355,13 @@ static u8 sub_0202C6CC (TrainerInfo * param0, u32 param1) return 0xff; } -void sub_0202C704 (UnkStruct_0202B628 * param0, u32 param1, u32 param2) +void sub_0202C704 (Journal * param0, u32 param1, u32 param2) { void * v0 = sub_0202BD98((u16)param1, param2); sub_0202B758(param0, v0, 1); } -void sub_0202C720 (UnkStruct_0202B628 * param0, u16 param1, u16 param2, u32 param3) +void sub_0202C720 (Journal * param0, u16 param1, u16 param2, u32 param3) { void * v0; u8 v1; diff --git a/src/unk_0203E880.c b/src/unk_0203E880.c index 357fdc739d..7e2628abc8 100644 --- a/src/unk_0203E880.c +++ b/src/unk_0203E880.c @@ -121,7 +121,7 @@ u16 sub_0203F304(u16 param0); u8 sub_0203F3C8(u16 param0); static BOOL sub_0203F404(UnkStruct_0203EF60 * param0, u16 param1); void sub_0203F310(FieldSystem * fieldSystem); -void sub_0203F598(FieldSystem * fieldSystem); +void FieldSystem_InitNewGameScripts(FieldSystem * fieldSystem); void sub_0203F5A4(FieldSystem * fieldSystem, u16 param1); BOOL sub_0203F5C0(FieldSystem * fieldSystem, u8 param1); static u16 sub_0203F610(const u8 * param0, u8 param1); @@ -887,7 +887,7 @@ UnkStruct_0203F478 * sub_0203F478 (FieldSystem * fieldSystem, int param1) return v0; } -void sub_0203F598 (FieldSystem * fieldSystem) +void FieldSystem_InitNewGameScripts (FieldSystem * fieldSystem) { sub_0203F5A4(fieldSystem, 9600); return; diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c index 3b1461ec1b..5fd8d0c16a 100644 --- a/src/unk_0203F6C4.c +++ b/src/unk_0203F6C4.c @@ -6172,7 +6172,7 @@ static BOOL ScrCmd_1CC (ScriptContext * ctx) FieldSystem * fieldSystem = ctx->fieldSystem; inline_02044528(SaveData_GetFieldEvents(fieldSystem->saveData)); - fieldSystem->unk_9C = sub_0202B634(sub_0202B628(fieldSystem->saveData), 1); + fieldSystem->unk_9C = sub_0202B634(SaveData_GetJournal(fieldSystem->saveData), 1); sub_02053494(fieldSystem); return 0; diff --git a/src/unk_02049D08.c b/src/unk_02049D08.c index d6a1afb348..16d7a3f4e4 100644 --- a/src/unk_02049D08.c +++ b/src/unk_02049D08.c @@ -654,7 +654,7 @@ void sub_0204A660 (UnkStruct_0204AFC4 * param0, SaveData * param1) sub_0204A5EC(param0, param1, 0, v0); } -void sub_0204A7A4 (UnkStruct_0204AFC4 * param0, SaveData * param1, UnkStruct_0202B628 * param2) +void sub_0204A7A4 (UnkStruct_0204AFC4 * param0, SaveData * param1, Journal * param2) { u32 v0 = 0; int v1; diff --git a/src/unk_02051D8C.c b/src/unk_02051D8C.c index 4f027fe29d..31381c7430 100644 --- a/src/unk_02051D8C.c +++ b/src/unk_02051D8C.c @@ -249,7 +249,7 @@ void sub_020521A4 (BattleParams * param0, const ChatotCry * param1, int param2) CopyChatotCryData(param0->unk_F0[param2], param1); } -void sub_020521B8 (BattleParams * param0, const FieldSystem * fieldSystem, SaveData * param2, int param3, UnkStruct_0202B628 * param4, UnkStruct_0207D99C * param5, UnkStruct_0209C370 * param6) +void sub_020521B8 (BattleParams * param0, const FieldSystem * fieldSystem, SaveData * param2, int param3, Journal * param4, UnkStruct_0207D99C * param5, UnkStruct_0209C370 * param6) { TrainerInfo * v0 = SaveData_GetTrainerInfo(param2); Party * v1 = Party_GetFromSavedata(param2); diff --git a/src/unk_020530C8.c b/src/unk_020530C8.c index 74cf2bff2e..4f19939834 100644 --- a/src/unk_020530C8.c +++ b/src/unk_020530C8.c @@ -480,10 +480,10 @@ static BOOL FieldTask_LoadMapFromNewGame (TaskManager * taskMan) return FALSE; } -void sub_020535CC (FieldSystem * fieldSystem) +void FieldSystem_SetLoadMapFromNewGameTask (FieldSystem * fieldSystem) { fieldSystem->unk_70 = 0; - sub_0203F598(fieldSystem); + FieldSystem_InitNewGameScripts(fieldSystem); FieldTask_Set(fieldSystem, FieldTask_LoadMapFromNewGame, NULL); } @@ -497,13 +497,13 @@ static BOOL FieldTask_LoadMapFromContinueGame (TaskManager * taskMan) case 0: sub_0202878C(fieldSystem->saveData); - if (sub_0202B6A4(sub_0202B628(fieldSystem->saveData), inline_020535E8(events))) { + if (Journal_CheckOpenOnContinue(SaveData_GetJournal(fieldSystem->saveData), inline_020535E8(events))) { sub_0203D30C(fieldSystem, NULL); (*state) = 4; break; } case 1: - fieldSystem->unk_9C = sub_0202B634(sub_0202B628(fieldSystem->saveData), inline_020535E8(events)); + fieldSystem->unk_9C = sub_0202B634(SaveData_GetJournal(fieldSystem->saveData), inline_020535E8(events)); if (sub_0206ADBC(events)) { FieldStatus * v3 = SaveData_GetFieldStatus(fieldSystem->saveData); @@ -562,7 +562,7 @@ static BOOL sub_02053718 (TaskManager * taskMan) sub_0200F344(0, 0x0); sub_0200F344(1, 0x0); sub_0202878C(fieldSystem->saveData); - fieldSystem->unk_9C = sub_0202B634(sub_0202B628(fieldSystem->saveData), inline_020535E8(v2)); + fieldSystem->unk_9C = sub_0202B634(SaveData_GetJournal(fieldSystem->saveData), inline_020535E8(v2)); (*state)++; break; case 1: diff --git a/src/unk_0208BA78.c b/src/unk_0208BA78.c index 1e1b84ce12..68c781d1ab 100644 --- a/src/unk_0208BA78.c +++ b/src/unk_0208BA78.c @@ -78,7 +78,7 @@ void sub_0208BA84 (UnkStruct_0208BA84 * param0, BOOL param1, int param2) static void sub_0208BA8C (SaveData * param0, int param1, u32 param2) { - UnkStruct_0202B628 * v0 = sub_0202B628(param0); + Journal * v0 = SaveData_GetJournal(param0); void * v1 = sub_0202C244(param1, param2); sub_0202B758(v0, v1, 4); diff --git a/src/unk_020933F8.c b/src/unk_020933F8.c index 54240f68e1..4a480af6b1 100644 --- a/src/unk_020933F8.c +++ b/src/unk_020933F8.c @@ -1580,7 +1580,7 @@ void sub_02094BB4 (UnkStruct_02095C48 * param0, int * param1, int * param2, int } } -void sub_02094C44 (UnkStruct_02095C48 * param0, SaveData * param1, u32 param2, UnkStruct_0202B628 * param3) +void sub_02094C44 (UnkStruct_02095C48 * param0, SaveData * param1, u32 param2, Journal * param3) { int v0; @@ -1673,10 +1673,10 @@ void sub_02094C44 (UnkStruct_02095C48 * param0, SaveData * param1, u32 param2, U { void * v9; - UnkStruct_0202B628 * v10; + Journal * v10; v9 = sub_0202C1C0(param0->unk_00.unk_118[param0->unk_00.unk_113].unk_08 + 1, 11); - v10 = sub_0202B628(param0->unk_1970); + v10 = SaveData_GetJournal(param0->unk_1970); sub_0202B758(param3, v9, 4); } diff --git a/src/unk_02099604.c b/src/unk_02099604.c index 35cd3f1c3a..4c97d1fd6d 100644 --- a/src/unk_02099604.c +++ b/src/unk_02099604.c @@ -16,11 +16,11 @@ FS_EXTERN_OVERLAY(overlay82); -UnkStruct_ov82_0223B164 * sub_02099604(int param0, SaveData * param1, int param2, UnkStruct_0202B628 * param3); +UnkStruct_ov82_0223B164 * sub_02099604(int param0, SaveData * param1, int param2, Journal * param3); UnkStruct_ov82_0223B164 * sub_02099674(FieldSystem * fieldSystem, int param1, int param2); UnkStruct_ov82_0223B164 * sub_020996A0(FieldSystem * fieldSystem, int param1, BOOL param2); -UnkStruct_ov82_0223B164 * sub_02099604 (int param0, SaveData * param1, int param2, UnkStruct_0202B628 * param3) +UnkStruct_ov82_0223B164 * sub_02099604 (int param0, SaveData * param1, int param2, Journal * param3) { UnkStruct_ov82_0223B164 * v0; diff --git a/src/unk_0209C194.c b/src/unk_0209C194.c index 1f59a3c1a6..ae1f9c5e66 100644 --- a/src/unk_0209C194.c +++ b/src/unk_0209C194.c @@ -73,7 +73,7 @@ void * sub_0209C1EC (FieldSystem * fieldSystem) v0->unk_08.unk_0C = fieldSystem->unk_80; v0->unk_08.unk_10 = SaveData_Options(fieldSystem->saveData); v0->unk_08.unk_14 = sub_0202CD88(fieldSystem->saveData); - v0->unk_08.unk_18 = sub_0202B628(fieldSystem->saveData); + v0->unk_08.unk_18 = SaveData_GetJournal(fieldSystem->saveData); v0->unk_08.unk_04 = Options_Frame(v0->unk_08.unk_10); v0->unk_08.fieldSystem = fieldSystem;