Identify Journal struct

This commit is contained in:
Adrienn Tindall
2024-06-02 06:31:53 -04:00
parent 40930d8f58
commit aea5b883ff
35 changed files with 99 additions and 99 deletions

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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

View File

@@ -7,7 +7,7 @@
typedef struct {
UnkStruct_0205C22C * unk_00;
UnkStruct_0202B628 * unk_04;
Journal * unk_04;
Options * unk_08;
} UnkStruct_0203DDFC;

View File

@@ -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

View File

@@ -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;

View File

@@ -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;

View File

@@ -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

View File

@@ -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);

View File

@@ -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);

View File

@@ -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);

View File

@@ -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);

View File

@@ -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);

View File

@@ -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;
}

View File

@@ -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);

View File

@@ -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);

View File

@@ -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);

View File

@@ -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);

View File

@@ -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);

View File

@@ -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];

View File

@@ -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 &param0[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 &param0[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 *)&param0[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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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);

View File

@@ -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:

View File

@@ -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);

View File

@@ -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);
}

View File

@@ -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;

View File

@@ -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;