diff --git a/include/field_map_change.h b/include/field_map_change.h index 9889ae06e5..96c8a225e3 100644 --- a/include/field_map_change.h +++ b/include/field_map_change.h @@ -7,8 +7,8 @@ #include "functypes/funcptr_02050904.h" void sub_020531A0(FieldSystem * fieldSystem); -void FieldSystem_MapChange_UpdateGameData(FieldSystem * fieldSystem, BOOL param1); -void FieldSystem_MapChange_UpdateGameDataDistortionWorld(FieldSystem * fieldSystem, BOOL param1); +void FieldMapChange_UpdateGameData(FieldSystem * fieldSystem, BOOL param1); +void FieldMapChange_UpdateGameDataDistortionWorld(FieldSystem * fieldSystem, BOOL param1); void sub_02053494(FieldSystem * fieldSystem); void FieldSystem_SetLoadMapFromNewGameTask(FieldSystem * fieldSystem); void FieldSystem_SetLoadMapFromContinueGameTask(FieldSystem * fieldSystem); diff --git a/include/inlines.h b/include/inlines.h index 23a8ebf804..e68bb08e4d 100644 --- a/include/inlines.h +++ b/include/inlines.h @@ -169,37 +169,37 @@ static inline u16 ScriptContext_GetVar (ScriptContext * ctx) return sub_0203F150(ctx->fieldSystem, ScriptContext_ReadHalfWord(ctx)); } -static inline void inline_0204E650 (FieldEvents * param0) +static inline void inline_0204E650 (VarsFlags * param0) { sub_0206AEAC(param0, 1); } -static inline void inline_0204E650_1 (FieldEvents * param0) +static inline void inline_0204E650_1 (VarsFlags * param0) { sub_0206AEAC(param0, 0); } -static inline BOOL inline_0204E650_2 (FieldEvents * param0) +static inline BOOL inline_0204E650_2 (VarsFlags * param0) { return sub_0206AEAC(param0, 2); } -static inline void inline_02044528 (FieldEvents * param0) +static inline void inline_02044528 (VarsFlags * param0) { sub_0206AF2C(param0, 1); } -static inline BOOL inline_020535E8 (FieldEvents * param0) +static inline BOOL inline_020535E8 (VarsFlags * param0) { return sub_0206AF2C(param0, 2); } -static inline void inline_0203A8E8 (FieldEvents * param0, u32 param1) +static inline void inline_0203A8E8 (VarsFlags * param0, u32 param1) { sub_0206AF3C(param0, 1, param1); } -static inline BOOL inline_0208BE68 (FieldEvents * param0, u32 param1) +static inline BOOL inline_0208BE68 (VarsFlags * param0, u32 param1) { return sub_0206AF3C(param0, 2, param1); } diff --git a/include/overlay007/struct_ov7_0224D008.h b/include/overlay007/struct_ov7_0224D008.h index 13094b46d9..3c61791962 100644 --- a/include/overlay007/struct_ov7_0224D008.h +++ b/include/overlay007/struct_ov7_0224D008.h @@ -41,7 +41,7 @@ typedef struct { Journal * unk_27C; UnkStruct_0202CD88 * unk_280; SaveData * unk_284; - FieldEvents * unk_288; + VarsFlags * unk_288; BOOL unk_28C; u16 * unk_290; u8 unk_294; diff --git a/include/struct_decls/struct_020507E4_decl.h b/include/struct_decls/struct_020507E4_decl.h index 5cc59012e2..300bce652a 100644 --- a/include/struct_decls/struct_020507E4_decl.h +++ b/include/struct_decls/struct_020507E4_decl.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_020507E4_DECL_H #define POKEPLATINUM_STRUCT_020507E4_DECL_H -typedef struct UnkStruct_020507E4_t FieldEvents; +typedef struct UnkStruct_020507E4_t VarsFlags; #endif // POKEPLATINUM_STRUCT_020507E4_DECL_H diff --git a/include/unk_020507CC.h b/include/unk_020507CC.h index 9c459a7af4..00ab9d274e 100644 --- a/include/unk_020507CC.h +++ b/include/unk_020507CC.h @@ -4,13 +4,13 @@ #include "struct_decls/struct_020507E4_decl.h" #include "savedata.h" -int FieldEvents_SaveSize(void); -void FieldEvents_Init(FieldEvents * param0); -FieldEvents * SaveData_GetFieldEvents(SaveData * param0); -BOOL sub_020507F0(FieldEvents * param0, u16 param1); -void sub_0205081C(FieldEvents * param0, u16 param1); -void sub_02050844(FieldEvents * param0, u16 param1); -u8 * sub_02050870(FieldEvents * param0, u16 param1); -u16 * sub_020508B8(FieldEvents * param0, u16 param1); +int VarsFlags_Size(void); +void VarsFlags_Init(VarsFlags * param0); +VarsFlags * SaveData_GetVarsFlags(SaveData * param0); +BOOL sub_020507F0(VarsFlags * param0, u16 param1); +void sub_0205081C(VarsFlags * param0, u16 param1); +void sub_02050844(VarsFlags * param0, u16 param1); +u8 * sub_02050870(VarsFlags * param0, u16 param1); +u16 * sub_020508B8(VarsFlags * param0, u16 param1); #endif // POKEPLATINUM_UNK_020507CC_H diff --git a/include/unk_020553DC.h b/include/unk_020553DC.h index 19b6bc1e3b..4b244bf0c0 100644 --- a/include/unk_020553DC.h +++ b/include/unk_020553DC.h @@ -11,7 +11,7 @@ u16 sub_02055428(FieldSystem * fieldSystem, int param1); u16 sub_020554A4(FieldSystem * fieldSystem, int param1); BOOL sub_02055554(FieldSystem * fieldSystem, u16 param1, int param2); u16 sub_0205560C(int param0); -void Sound_TryFadeInBgm(FieldSystem * fieldSystem, int param1); +void Sound_TryFadeInBGM(FieldSystem * fieldSystem, int param1); void Sound_PlayMapBGM(FieldSystem * fieldSystem, int param1); void sub_020556A0(FieldSystem * fieldSystem, int param1); diff --git a/include/unk_0206A8DC.h b/include/unk_0206A8DC.h index 2c003a4363..4b1e33ce30 100644 --- a/include/unk_0206A8DC.h +++ b/include/unk_0206A8DC.h @@ -3,62 +3,62 @@ #include "struct_decls/struct_020507E4_decl.h" -void sub_0206A92C(FieldEvents * param0); -BOOL sub_0206A938(FieldEvents * param0); -void sub_0206A944(FieldEvents * param0); -BOOL sub_0206A954(FieldEvents * param0); -void sub_0206A964(FieldEvents * param0); -void sub_0206A974(FieldEvents * param0); -BOOL sub_0206A984(FieldEvents * param0); -void sub_0206A994(FieldEvents * param0); -void sub_0206A9A4(FieldEvents * param0); -BOOL sub_0206A9B4(FieldEvents * param0); -void sub_0206A9C4(FieldEvents * param0); -void sub_0206A9D4(FieldEvents * param0); -BOOL sub_0206A9E4(FieldEvents * param0); -void sub_0206A9F4(FieldEvents * param0); -void sub_0206AA04(FieldEvents * param0); -void sub_0206AA14(FieldEvents * param0); -void sub_0206AA20(FieldEvents * param0); -void sub_0206AA30(FieldEvents * param0); -void sub_0206AA40(FieldEvents * param0); -void sub_0206AA50(FieldEvents * param0, int param1); -BOOL sub_0206AAA8(FieldEvents * param0, int param1); -BOOL sub_0206AB00(FieldEvents * param0, int param1); -u16 sub_0206AB68(FieldEvents * param0, int param1); -void sub_0206AD9C(FieldEvents * param0); -void FieldEvents_ResetCommClub(FieldEvents * param0); -BOOL FieldEvents_CheckCommClub(FieldEvents * param0); -BOOL EventFlag_VisitedContestHall(FieldEvents * param0); -BOOL sub_0206ADDC(FieldEvents * param0); -BOOL sub_0206ADEC(FieldEvents * param0); -BOOL sub_0206ADFC(FieldEvents * param0); -void sub_0206AE0C(FieldEvents * param0); -void sub_0206AE1C(FieldEvents * param0); -BOOL sub_0206AE2C(FieldEvents * param0); -void sub_0206AE3C(FieldEvents * param0); -void sub_0206AE4C(FieldEvents * param0); -BOOL sub_0206AE5C(FieldEvents * param0); -void sub_0206AE6C(FieldEvents * param0); -void sub_0206AE7C(FieldEvents * param0); -BOOL sub_0206AE8C(FieldEvents * param0); -void sub_0206AE9C(FieldEvents * param0); -BOOL sub_0206AEAC(FieldEvents * param0, int param1); -void sub_0206AEBC(FieldEvents * param0); -void sub_0206AECC(FieldEvents * param0); -BOOL FieldEvents_CheckFlash(FieldEvents * param0); -void sub_0206AEEC(FieldEvents * param0); -void sub_0206AEFC(FieldEvents * param0); -BOOL FieldEvents_CheckDefog(FieldEvents * param0); -BOOL sub_0206AF1C(FieldEvents * param0, int param1); -BOOL sub_0206AF2C(FieldEvents * param0, int param1); -BOOL sub_0206AF3C(FieldEvents * param0, int param1, u32 param2); -void sub_0206AF5C(FieldEvents * param0); -BOOL sub_0206AF6C(FieldEvents * param0, int param1, int param2); -void sub_0206AF90(FieldEvents * param0); -void sub_0206AFA0(FieldEvents * param0); -BOOL sub_0206AFB0(FieldEvents * param0, int param1, int param2); -BOOL sub_0206AFC0(FieldEvents * param0, int param1); -BOOL sub_0206AFD0(FieldEvents * param0); +void sub_0206A92C(VarsFlags * param0); +BOOL sub_0206A938(VarsFlags * param0); +void sub_0206A944(VarsFlags * param0); +BOOL sub_0206A954(VarsFlags * param0); +void sub_0206A964(VarsFlags * param0); +void sub_0206A974(VarsFlags * param0); +BOOL sub_0206A984(VarsFlags * param0); +void sub_0206A994(VarsFlags * param0); +void sub_0206A9A4(VarsFlags * param0); +BOOL sub_0206A9B4(VarsFlags * param0); +void sub_0206A9C4(VarsFlags * param0); +void sub_0206A9D4(VarsFlags * param0); +BOOL sub_0206A9E4(VarsFlags * param0); +void sub_0206A9F4(VarsFlags * param0); +void sub_0206AA04(VarsFlags * param0); +void sub_0206AA14(VarsFlags * param0); +void sub_0206AA20(VarsFlags * param0); +void sub_0206AA30(VarsFlags * param0); +void sub_0206AA40(VarsFlags * param0); +void sub_0206AA50(VarsFlags * param0, int param1); +BOOL sub_0206AAA8(VarsFlags * param0, int param1); +BOOL sub_0206AB00(VarsFlags * param0, int param1); +u16 sub_0206AB68(VarsFlags * param0, int param1); +void sub_0206AD9C(VarsFlags * param0); +void FieldEvents_ResetCommClub(VarsFlags * param0); +BOOL FieldEvents_CheckCommClub(VarsFlags * param0); +BOOL EventFlag_VisitedContestHall(VarsFlags * param0); +BOOL sub_0206ADDC(VarsFlags * param0); +BOOL sub_0206ADEC(VarsFlags * param0); +BOOL sub_0206ADFC(VarsFlags * param0); +void sub_0206AE0C(VarsFlags * param0); +void sub_0206AE1C(VarsFlags * param0); +BOOL sub_0206AE2C(VarsFlags * param0); +void sub_0206AE3C(VarsFlags * param0); +void sub_0206AE4C(VarsFlags * param0); +BOOL sub_0206AE5C(VarsFlags * param0); +void sub_0206AE6C(VarsFlags * param0); +void sub_0206AE7C(VarsFlags * param0); +BOOL sub_0206AE8C(VarsFlags * param0); +void sub_0206AE9C(VarsFlags * param0); +BOOL sub_0206AEAC(VarsFlags * param0, int param1); +void sub_0206AEBC(VarsFlags * param0); +void sub_0206AECC(VarsFlags * param0); +BOOL FieldEvents_CheckFlash(VarsFlags * param0); +void sub_0206AEEC(VarsFlags * param0); +void sub_0206AEFC(VarsFlags * param0); +BOOL FieldEvents_CheckDefog(VarsFlags * param0); +BOOL sub_0206AF1C(VarsFlags * param0, int param1); +BOOL sub_0206AF2C(VarsFlags * param0, int param1); +BOOL sub_0206AF3C(VarsFlags * param0, int param1, u32 param2); +void sub_0206AF5C(VarsFlags * param0); +BOOL sub_0206AF6C(VarsFlags * param0, int param1, int param2); +void sub_0206AF90(VarsFlags * param0); +void sub_0206AFA0(VarsFlags * param0); +BOOL sub_0206AFB0(VarsFlags * param0, int param1, int param2); +BOOL sub_0206AFC0(VarsFlags * param0, int param1); +BOOL sub_0206AFD0(VarsFlags * param0); #endif // POKEPLATINUM_UNK_0206A8DC_H diff --git a/include/unk_0206AFE0.h b/include/unk_0206AFE0.h index fe94d5140b..0fb72ce41f 100644 --- a/include/unk_0206AFE0.h +++ b/include/unk_0206AFE0.h @@ -4,76 +4,76 @@ #include "struct_decls/struct_020507E4_decl.h" #include "savedata.h" -BOOL sub_0206B024(FieldEvents * param0, u16 param1); -u16 sub_0206B034(FieldEvents * param0); -BOOL sub_0206B044(FieldEvents * param0, u16 param1); -u16 sub_0206B054(FieldEvents * param0); -u16 sub_0206B064(FieldEvents * param0); -u16 sub_0206B08C(FieldEvents * param0); -u16 sub_0206B0B4(FieldEvents * param0); -BOOL sub_0206B0C4(FieldEvents * param0, u16 param1); -void FieldEvents_ResetVSSeeker(FieldEvents * param0); -u16 sub_0206B0E8(FieldEvents * param0); -BOOL sub_0206B0F8(FieldEvents * param0, u16 param1); -u16 sub_0206B108(FieldEvents * param0); -BOOL sub_0206B118(FieldEvents * param0, u16 param1); -void sub_0206B144(FieldEvents * param0, int param1); -BOOL sub_0206B16C(FieldEvents * param0, int param1); -void sub_0206B1B0(FieldEvents * param0, int param1); -void sub_0206B1D8(FieldEvents * param0, int param1); -BOOL sub_0206B1F0(FieldEvents * param0, int param1); -BOOL sub_0206B218(FieldEvents * param0); -u16 sub_0206B228(FieldEvents * param0); -BOOL sub_0206B238(FieldEvents * param0); -u16 sub_0206B260(FieldEvents * param0); -BOOL sub_0206B270(FieldEvents * param0, u16 param1); -void sub_0206B280(FieldEvents * param0, u32 param1); -u32 sub_0206B2A4(FieldEvents * param0); -void sub_0206B2C8(FieldEvents * param0); +BOOL sub_0206B024(VarsFlags * param0, u16 param1); +u16 sub_0206B034(VarsFlags * param0); +BOOL sub_0206B044(VarsFlags * param0, u16 param1); +u16 sub_0206B054(VarsFlags * param0); +u16 sub_0206B064(VarsFlags * param0); +u16 sub_0206B08C(VarsFlags * param0); +u16 sub_0206B0B4(VarsFlags * param0); +BOOL sub_0206B0C4(VarsFlags * param0, u16 param1); +void FieldEvents_ResetVSSeeker(VarsFlags * param0); +u16 sub_0206B0E8(VarsFlags * param0); +BOOL sub_0206B0F8(VarsFlags * param0, u16 param1); +u16 sub_0206B108(VarsFlags * param0); +BOOL sub_0206B118(VarsFlags * param0, u16 param1); +void sub_0206B144(VarsFlags * param0, int param1); +BOOL sub_0206B16C(VarsFlags * param0, int param1); +void sub_0206B1B0(VarsFlags * param0, int param1); +void sub_0206B1D8(VarsFlags * param0, int param1); +BOOL sub_0206B1F0(VarsFlags * param0, int param1); +BOOL sub_0206B218(VarsFlags * param0); +u16 sub_0206B228(VarsFlags * param0); +BOOL sub_0206B238(VarsFlags * param0); +u16 sub_0206B260(VarsFlags * param0); +BOOL sub_0206B270(VarsFlags * param0, u16 param1); +void sub_0206B280(VarsFlags * param0, u32 param1); +u32 sub_0206B2A4(VarsFlags * param0); +void sub_0206B2C8(VarsFlags * param0); void sub_0206B2E4(SaveData * param0, u16 param1); -u16 sub_0206B314(FieldEvents * param0); -BOOL sub_0206B324(FieldEvents * param0, u16 param1); +u16 sub_0206B314(VarsFlags * param0); +BOOL sub_0206B324(VarsFlags * param0, u16 param1); void sub_0206B334(SaveData * param0); -u16 sub_0206B354(FieldEvents * param0); -BOOL sub_0206B364(FieldEvents * param0, u16 param1); -u16 sub_0206B374(FieldEvents * param0); -BOOL sub_0206B384(FieldEvents * param0, u16 param1); -u16 sub_0206B394(FieldEvents * param0); -BOOL sub_0206B3A4(FieldEvents * param0, u16 param1); -BOOL sub_0206B3B4(FieldEvents * param0); -u16 sub_0206B3DC(FieldEvents * param0); -u16 sub_0206B3EC(FieldEvents * param0); -BOOL sub_0206B3FC(FieldEvents * param0, u16 param1); -u16 sub_0206B40C(FieldEvents * param0); -BOOL sub_0206B41C(FieldEvents * param0, u16 param1); -u16 sub_0206B42C(FieldEvents * param0); -BOOL sub_0206B43C(FieldEvents * param0, u16 param1); -u16 sub_0206B44C(FieldEvents * param0); -void sub_0206B45C(FieldEvents * param0, u16 param1); -void sub_0206B46C(FieldEvents * param0, u16 param1); -u16 sub_0206B47C(FieldEvents * param0); -void sub_0206B48C(FieldEvents * param0, u16 param1); +u16 sub_0206B354(VarsFlags * param0); +BOOL sub_0206B364(VarsFlags * param0, u16 param1); +u16 sub_0206B374(VarsFlags * param0); +BOOL sub_0206B384(VarsFlags * param0, u16 param1); +u16 sub_0206B394(VarsFlags * param0); +BOOL sub_0206B3A4(VarsFlags * param0, u16 param1); +BOOL sub_0206B3B4(VarsFlags * param0); +u16 sub_0206B3DC(VarsFlags * param0); +u16 sub_0206B3EC(VarsFlags * param0); +BOOL sub_0206B3FC(VarsFlags * param0, u16 param1); +u16 sub_0206B40C(VarsFlags * param0); +BOOL sub_0206B41C(VarsFlags * param0, u16 param1); +u16 sub_0206B42C(VarsFlags * param0); +BOOL sub_0206B43C(VarsFlags * param0, u16 param1); +u16 sub_0206B44C(VarsFlags * param0); +void sub_0206B45C(VarsFlags * param0, u16 param1); +void sub_0206B46C(VarsFlags * param0, u16 param1); +u16 sub_0206B47C(VarsFlags * param0); +void sub_0206B48C(VarsFlags * param0, u16 param1); void sub_0206B514(SaveData * param0); -void sub_0206B558(FieldEvents * param0, u16 param1); -u16 sub_0206B588(FieldEvents * param0); -u16 sub_0206B598(FieldEvents * param0); -u16 sub_0206B5A8(FieldEvents * param0); -u16 sub_0206B5B8(FieldEvents * param0); -u16 sub_0206B5C8(FieldEvents * param0); -u16 sub_0206B5D8(FieldEvents * param0); -void sub_0206B5E8(FieldEvents * param0, u16 param1); -u16 sub_0206B5F8(FieldEvents * param0); -void sub_0206B608(FieldEvents * param0, u16 param1); -u16 sub_0206B618(FieldEvents * param0); -void sub_0206B628(FieldEvents * param0, u16 param1); -void sub_0206B638(FieldEvents * param0, u16 param1); -void sub_0206B648(FieldEvents * param0, u16 param1); -void sub_0206B658(FieldEvents * param0, u16 param1); -void sub_0206B668(FieldEvents * param0, u16 param1); -void sub_0206B678(FieldEvents * param0, u16 param1); -void sub_0206B688(FieldEvents * param0, u16 param1, u16 param2); -u16 sub_0206B6DC(FieldEvents * param0); -void sub_0206B6EC(FieldEvents * param0, u16 param1); -u16 sub_0206B6FC(FieldEvents * param0); +void sub_0206B558(VarsFlags * param0, u16 param1); +u16 sub_0206B588(VarsFlags * param0); +u16 sub_0206B598(VarsFlags * param0); +u16 sub_0206B5A8(VarsFlags * param0); +u16 sub_0206B5B8(VarsFlags * param0); +u16 sub_0206B5C8(VarsFlags * param0); +u16 sub_0206B5D8(VarsFlags * param0); +void sub_0206B5E8(VarsFlags * param0, u16 param1); +u16 sub_0206B5F8(VarsFlags * param0); +void sub_0206B608(VarsFlags * param0, u16 param1); +u16 sub_0206B618(VarsFlags * param0); +void sub_0206B628(VarsFlags * param0, u16 param1); +void sub_0206B638(VarsFlags * param0, u16 param1); +void sub_0206B648(VarsFlags * param0, u16 param1); +void sub_0206B658(VarsFlags * param0, u16 param1); +void sub_0206B668(VarsFlags * param0, u16 param1); +void sub_0206B678(VarsFlags * param0, u16 param1); +void sub_0206B688(VarsFlags * param0, u16 param1, u16 param2); +u16 sub_0206B6DC(VarsFlags * param0); +void sub_0206B6EC(VarsFlags * param0, u16 param1); +u16 sub_0206B6FC(VarsFlags * param0); #endif // POKEPLATINUM_UNK_0206AFE0_H diff --git a/src/field_map_change.c b/src/field_map_change.c index 275d778b40..834f6d50eb 100644 --- a/src/field_map_change.c +++ b/src/field_map_change.c @@ -77,6 +77,7 @@ #include "overlay023/ov23_022499E4.h" #include "overlay023/ov23_0224B05C.h" +#include "consts/map.h" #include "constants/overworld_weather.h" FS_EXTERN_OVERLAY(overlay23); @@ -141,7 +142,7 @@ typedef struct { static BOOL FieldTask_ChangeMap(TaskManager * taskMan); static BOOL FieldTask_LoadMapFromNewGame(TaskManager * taskMan); -static void FieldSystem_MapChange_SetNewLocation(FieldSystem * fieldSystem, const Location * param1); +static void FieldMapChange_SetNewLocation(FieldSystem * fieldSystem, const Location * param1); static void sub_020533CC(FieldSystem * fieldSystem); static void sub_02053468(FieldSystem * fieldSystem); static void FieldSystem_MapChange_CreatePlayerObject(FieldSystem * fieldSystem); @@ -185,13 +186,13 @@ static void sub_020530C8 (FieldSystem * fieldSystem) BOOL inBattleTower; switch (fieldSystem->location->mapId) { - case 326: - case 327: - case 328: - case 329: - case 330: - case 331: - case 493: + case MAP_HEADER_BATTLE_TOWER: + case MAP_HEADER_BATTLE_TOWER_ELEVATOR: + case MAP_HEADER_BATTLE_TOWER_CORRIDOR: + case MAP_HEADER_BATTLE_TOWER_CORRIDOR_MULTI: + case MAP_HEADER_BATTLE_TOWER_BATTLE_ROOM: + case MAP_HEADER_BATTLE_TOWER_MULTI_BATTLE_ROOM: + case MAP_HEADER_BATTLE_TOWER_BATTLE_SALON: inBattleTower = TRUE; break; default: @@ -207,10 +208,10 @@ static void sub_020530C8 (FieldSystem * fieldSystem) } } -static void FieldSystem_MapChange_SetNewLocation (FieldSystem * fieldSystem, const Location * nextLocation) +static void FieldMapChange_SetNewLocation (FieldSystem * fieldSystem, const Location * nextLocation) { - FieldOverworldState * fieldStatus = SaveData_GetFieldOverworldState(fieldSystem->saveData); - Location * location = FieldOverworldState_GetPrevLocation(fieldStatus); + FieldOverworldState * fieldState = SaveData_GetFieldOverworldState(fieldSystem->saveData); + Location * location = FieldOverworldState_GetPrevLocation(fieldState); if (nextLocation != NULL) { *location = *fieldSystem->location; @@ -230,8 +231,8 @@ static void FieldSystem_MapChange_SetNewLocation (FieldSystem * fieldSystem, con if (v2->unk_06 == 0x100) { Location * v3, * entrance; - v3 = sub_0203A730(fieldStatus); - entrance = FieldOverworldState_GetEntranceLocation(fieldStatus); + v3 = sub_0203A730(fieldState); + entrance = FieldOverworldState_GetEntranceLocation(fieldState); *v3 = *entrance; } } @@ -243,10 +244,10 @@ void sub_020531A0 (FieldSystem * fieldSystem) gCoreSys.unk_65 = fieldSystem->unk_74->unk_00_12; } -void FieldSystem_MapChange_UpdateGameData (FieldSystem * fieldSystem, BOOL noWarp) +void FieldMapChange_UpdateGameData (FieldSystem * fieldSystem, BOOL noWarp) { int mapId = fieldSystem->location->mapId; - FieldOverworldState * fieldStatus = SaveData_GetFieldOverworldState(fieldSystem->saveData); + FieldOverworldState * fieldState = SaveData_GetFieldOverworldState(fieldSystem->saveData); Sound_ClearSpecialBGM(fieldSystem); FieldSystem_ClearLocalFlags(fieldSystem); @@ -257,7 +258,7 @@ void FieldSystem_MapChange_UpdateGameData (FieldSystem * fieldSystem, BOOL noWar FieldSystem_InitFlagsNoWarp(fieldSystem); } - FieldEvents_ResetVSSeeker(SaveData_GetFieldEvents(fieldSystem->saveData)); + FieldEvents_ResetVSSeeker(SaveData_GetVarsFlags(fieldSystem->saveData)); if (!noWarp) { sub_020559DC(fieldSystem); @@ -267,29 +268,29 @@ void FieldSystem_MapChange_UpdateGameData (FieldSystem * fieldSystem, BOOL noWar sub_02027F50(sub_02027860(fieldSystem->saveData)); } - FieldEvents * events = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * events = SaveData_GetVarsFlags(fieldSystem->saveData); u16 weather = FieldSystem_GetWeather(fieldSystem, mapId); if (((weather == OVERWORLD_WEATHER_FOG) && (FieldEvents_CheckDefog(events) == 1)) || ((weather == OVERWORLD_WEATHER_DARK_FLASH) && (FieldEvents_CheckFlash(events) == 1))) { weather = OVERWORLD_WEATHER_CLEAR; } - FieldOverworldState_SetWeather(fieldStatus, weather); + FieldOverworldState_SetWeather(fieldState, weather); if (noWarp) { - int cam1 = FieldOverworldState_GetCameraType(fieldStatus); + int cam1 = FieldOverworldState_GetCameraType(fieldState); int cam2 = MapHeader_GetCameraType(mapId); GF_ASSERT(cam1 == cam2); } else { - FieldOverworldState_SetCameraType(fieldStatus, MapHeader_GetCameraType(mapId)); + FieldOverworldState_SetCameraType(fieldState, MapHeader_GetCameraType(mapId)); } if (!noWarp) { u16 warpId = sub_0203A858(mapId); if (warpId != 0) { - FieldOverworldState_SetWarpId(fieldStatus, warpId); + FieldOverworldState_SetWarpId(fieldState, warpId); } } @@ -299,10 +300,10 @@ void FieldSystem_MapChange_UpdateGameData (FieldSystem * fieldSystem, BOOL noWar fieldSystem->unk_78.unk_02 = 0; } -void FieldSystem_MapChange_UpdateGameDataDistortionWorld (FieldSystem * fieldSystem, BOOL param1) +void FieldMapChange_UpdateGameDataDistortionWorld (FieldSystem * fieldSystem, BOOL param1) { int mapId = fieldSystem->location->mapId; - FieldOverworldState * fieldStatus = SaveData_GetFieldOverworldState(fieldSystem->saveData); + FieldOverworldState * fieldState = SaveData_GetFieldOverworldState(fieldSystem->saveData); Sound_ClearSpecialBGM(fieldSystem); FieldSystem_ClearLocalFlags(fieldSystem); @@ -313,7 +314,7 @@ void FieldSystem_MapChange_UpdateGameDataDistortionWorld (FieldSystem * fieldSys FieldSystem_InitFlagsNoWarp(fieldSystem); } - FieldEvents_ResetVSSeeker(SaveData_GetFieldEvents(fieldSystem->saveData)); + FieldEvents_ResetVSSeeker(SaveData_GetVarsFlags(fieldSystem->saveData)); if (!param1) { sub_020559DC(fieldSystem); @@ -327,7 +328,7 @@ void FieldSystem_MapChange_UpdateGameDataDistortionWorld (FieldSystem * fieldSys u16 v2 = sub_0203A858(mapId); if (v2 != 0) { - FieldOverworldState_SetWarpId(fieldStatus, v2); + FieldOverworldState_SetWarpId(fieldState, v2); } } @@ -335,17 +336,17 @@ void FieldSystem_MapChange_UpdateGameDataDistortionWorld (FieldSystem * fieldSys fieldSystem->unk_78.unk_02 = 0; } -static void FieldSystem_MapChange_CreateObjects (FieldSystem * fieldSystem) +static void FieldMapChange_CreateObjects (FieldSystem * fieldSystem) { int gender; - FieldOverworldState * fieldStatus; + FieldOverworldState * fieldState; PlayerData * playerData; fieldSystem->mapObjMan = MapObjectMan_New(fieldSystem, 64, 5); gender = TrainerInfo_Gender(SaveData_GetTrainerInfo(fieldSystem->saveData)); - fieldStatus = SaveData_GetFieldOverworldState(fieldSystem->saveData); - playerData = FieldOverworldState_GetPlayerData(fieldStatus); + fieldState = SaveData_GetFieldOverworldState(fieldSystem->saveData); + playerData = FieldOverworldState_GetPlayerData(fieldState); fieldSystem->playerAvatar = PlayerAvatar_Init(fieldSystem->mapObjMan, fieldSystem->location->x, fieldSystem->location->z, fieldSystem->location->unk_10, playerData->unk_04, gender, 0, playerData); @@ -353,20 +354,20 @@ static void FieldSystem_MapChange_CreateObjects (FieldSystem * fieldSystem) MapObjectMan_StopAllMovement(fieldSystem->mapObjMan); } -static void FieldSystem_MapChange_DeleteObjects (FieldSystem * fieldSystem) +static void FieldMapChange_DeleteObjects (FieldSystem * fieldSystem) { Player_Delete(fieldSystem->playerAvatar); MapObjectMan_DeleteAll(fieldSystem->mapObjMan); MapObjectMan_Delete(fieldSystem->mapObjMan); } -static void FieldSystem_MapChange_LoadObjects (FieldSystem * fieldSystem) +static void FieldMapChange_LoadObjects (FieldSystem * fieldSystem) { fieldSystem->mapObjMan = MapObjectMan_New(fieldSystem, 64, 5); FieldSystem_LoadObjects(fieldSystem); - FieldOverworldState * fieldStatus = SaveData_GetFieldOverworldState(fieldSystem->saveData); - PlayerData * playerData = FieldOverworldState_GetPlayerData(fieldStatus); + FieldOverworldState * fieldState = SaveData_GetFieldOverworldState(fieldSystem->saveData); + PlayerData * playerData = FieldOverworldState_GetPlayerData(fieldState); int v2 = TrainerInfo_Gender(SaveData_GetTrainerInfo(fieldSystem->saveData)); fieldSystem->playerAvatar = sub_0205E820(fieldSystem->mapObjMan, playerData, v2); @@ -380,11 +381,11 @@ static void sub_020533CC (FieldSystem * fieldSystem) GF_ASSERT(fieldSystem->unk_5C == NULL); sub_02039DC0(fieldSystem->location->mapId, fieldSystem->unk_2C); - if (sub_0206B1F0(SaveData_GetFieldEvents(fieldSystem->saveData), 3)) { + if (sub_0206B1F0(SaveData_GetVarsFlags(fieldSystem->saveData), 3)) { sub_02039FE0(fieldSystem->unk_2C); //reveal Seabreak Path if Oak's Letter has been used } - if (!sub_0206B1F0(SaveData_GetFieldEvents(fieldSystem->saveData), 2)) { + if (!sub_0206B1F0(SaveData_GetVarsFlags(fieldSystem->saveData), 2)) { sub_02039F8C(fieldSystem->unk_2C); } @@ -453,7 +454,7 @@ static BOOL FieldSystem_IsSaveInUnionRoom (const FieldSystem * fieldSystem) static void FieldSystem_SetLocationToUnionRoomExit (FieldSystem * fieldSystem) { Location * v0 = sub_0203A730(SaveData_GetFieldOverworldState(fieldSystem->saveData)); - FieldEvents * events = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * events = SaveData_GetVarsFlags(fieldSystem->saveData); Location_Set(v0, fieldSystem->location->mapId, -1, 8, 2, 1); } @@ -465,10 +466,10 @@ static BOOL FieldTask_LoadMapFromNewGame (TaskManager * taskMan) switch (*state) { case 0: - FieldSystem_MapChange_SetNewLocation(fieldSystem, fieldSystem->location); + FieldMapChange_SetNewLocation(fieldSystem, fieldSystem->location); sub_020533CC(fieldSystem); - FieldSystem_MapChange_UpdateGameData(fieldSystem, 0); - FieldSystem_MapChange_CreateObjects(fieldSystem); + FieldMapChange_UpdateGameData(fieldSystem, 0); + FieldMapChange_CreateObjects(fieldSystem); (*state)++; break; case 1: @@ -492,7 +493,7 @@ void FieldSystem_SetLoadMapFromNewGameTask (FieldSystem * fieldSystem) static BOOL FieldTask_LoadMapFromContinueGame (TaskManager * taskMan) { FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - FieldEvents * events = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * events = SaveData_GetVarsFlags(fieldSystem->saveData); int * state = FieldTask_GetState(taskMan); switch (*state) { @@ -508,22 +509,22 @@ static BOOL FieldTask_LoadMapFromContinueGame (TaskManager * taskMan) fieldSystem->unk_9C = Journal_GetSavedPage(SaveData_GetJournal(fieldSystem->saveData), inline_020535E8(events)); if (FieldEvents_CheckCommClub(events)) { - FieldOverworldState * fieldStatus = SaveData_GetFieldOverworldState(fieldSystem->saveData); + FieldOverworldState * fieldState = SaveData_GetFieldOverworldState(fieldSystem->saveData); if (FieldSystem_IsSaveInUnionRoom(fieldSystem)) { FieldSystem_SetLocationToUnionRoomExit(fieldSystem); } FieldEvents_ResetCommClub(events); - FieldSystem_MapChange_SetNewLocation(fieldSystem, sub_0203A730(fieldStatus)); + FieldMapChange_SetNewLocation(fieldSystem, sub_0203A730(fieldState)); sub_020533CC(fieldSystem); - FieldSystem_MapChange_UpdateGameData(fieldSystem, 0); - FieldSystem_MapChange_CreateObjects(fieldSystem); + FieldMapChange_UpdateGameData(fieldSystem, 0); + FieldMapChange_CreateObjects(fieldSystem); } else { - FieldSystem_MapChange_SetNewLocation(fieldSystem, NULL); + FieldMapChange_SetNewLocation(fieldSystem, NULL); sub_020533CC(fieldSystem); sub_020559DC(fieldSystem); - FieldSystem_MapChange_LoadObjects(fieldSystem); + FieldMapChange_LoadObjects(fieldSystem); } sub_02053494(fieldSystem); @@ -556,7 +557,7 @@ static BOOL FieldTask_LoadMapFromError (TaskManager * taskMan) { FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); UnkStruct_02053718 * v1 = TaskManager_Environment(taskMan); - FieldEvents * v2 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v2 = SaveData_GetVarsFlags(fieldSystem->saveData); int * state = FieldTask_GetState(taskMan); switch (*state) { @@ -568,10 +569,10 @@ static BOOL FieldTask_LoadMapFromError (TaskManager * taskMan) (*state)++; break; case 1: - FieldSystem_MapChange_SetNewLocation(fieldSystem, &v1->unk_04); + FieldMapChange_SetNewLocation(fieldSystem, &v1->unk_04); sub_020533CC(fieldSystem); - FieldSystem_MapChange_UpdateGameData(fieldSystem, 0); - FieldSystem_MapChange_CreateObjects(fieldSystem); + FieldMapChange_UpdateGameData(fieldSystem, 0); + FieldMapChange_CreateObjects(fieldSystem); sub_020534BC(fieldSystem); (*state)++; break; @@ -606,7 +607,7 @@ void FieldSystem_StartLoadMapFromErrorTask (FieldSystem * fieldSystem) if (MapHeader_IsUnionRoom(fieldSystem->location->mapId)) { } else if (FieldSystem_IsSaveInUnionRoom(fieldSystem)) { - FieldEvents * events = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * events = SaveData_GetVarsFlags(fieldSystem->saveData); FieldSystem_SetLocationToUnionRoomExit(fieldSystem); sub_0206AD9C(events); @@ -632,7 +633,7 @@ static BOOL FieldTask_ChangeMap (TaskManager * taskMan) switch (v1->unk_00) { case 0: Sound_PlayEffect(1539); - Sound_TryFadeInBgm(fieldSystem, location->mapId); + Sound_TryFadeInBGM(fieldSystem, location->mapId); sub_02055974(taskMan); (v1->unk_00)++; break; @@ -674,19 +675,19 @@ static BOOL FieldTask_ChangeMapSub (TaskManager * taskMan) switch (v2->unk_00) { case 0: - FieldSystem_MapChange_DeleteObjects(fieldSystem); + FieldMapChange_DeleteObjects(fieldSystem); sub_02053468(fieldSystem); (v2->unk_00)++; break; case 1: - FieldSystem_MapChange_SetNewLocation(fieldSystem, &v2->unk_04); + FieldMapChange_SetNewLocation(fieldSystem, &v2->unk_04); sub_020533CC(fieldSystem); - FieldSystem_MapChange_UpdateGameData(fieldSystem, 0); + FieldMapChange_UpdateGameData(fieldSystem, 0); RadarChain_Clear(fieldSystem->chain); (v2->unk_00)++; break; case 2: - FieldSystem_MapChange_CreateObjects(fieldSystem); + FieldMapChange_CreateObjects(fieldSystem); Heap_FreeToHeap(v2); return 1; } @@ -726,7 +727,7 @@ static BOOL FieldTask_ChangeMapFull (TaskManager * taskMan) switch (v1->unk_00) { case 0: - Sound_TryFadeInBgm(fieldSystem, v2->mapId); + Sound_TryFadeInBGM(fieldSystem, v2->mapId); sub_02055820(taskMan); (v1->unk_00)++; break; @@ -799,7 +800,7 @@ static BOOL sub_02053B44 (TaskManager * taskMan) switch (v1->unk_00) { case 0: - Sound_TryFadeInBgm(fieldSystem, v2->mapId); + Sound_TryFadeInBGM(fieldSystem, v2->mapId); sub_02053BD4(taskMan); (v1->unk_00)++; break; @@ -921,7 +922,7 @@ static BOOL sub_02053D0C (TaskManager * taskMan) switch (v1->unk_00) { case 0: - Sound_TryFadeInBgm(fieldSystem, v2->mapId); + Sound_TryFadeInBGM(fieldSystem, v2->mapId); sub_02053DB4(taskMan); (v1->unk_00)++; break; @@ -1035,7 +1036,7 @@ static BOOL sub_02053E98 (TaskManager * taskMan) break; case 1: if (v1->unk_04) { - Sound_TryFadeInBgm(fieldSystem, v2->mapId); + Sound_TryFadeInBGM(fieldSystem, v2->mapId); sub_02055820(taskMan); v1->unk_00++; } @@ -1367,16 +1368,16 @@ static BOOL sub_02054494 (TaskManager * taskMan) switch (v1->unk_00) { case 0: - FieldSystem_MapChange_DeleteObjects(fieldSystem); + FieldMapChange_DeleteObjects(fieldSystem); (v1->unk_00)++; break; case 1: - FieldSystem_MapChange_SetNewLocation(fieldSystem, &v1->unk_04); + FieldMapChange_SetNewLocation(fieldSystem, &v1->unk_04); sub_0203F5C0(fieldSystem, 2); (v1->unk_00)++; break; case 2: - FieldSystem_MapChange_CreateObjects(fieldSystem); + FieldMapChange_CreateObjects(fieldSystem); Heap_FreeToHeap(v1); return 1; } @@ -1409,7 +1410,7 @@ static BOOL sub_02054538 (TaskManager * taskMan) switch (*v2) { case 0: - Sound_TryFadeInBgm(fieldSystem, v3->mapId); + Sound_TryFadeInBGM(fieldSystem, v3->mapId); ov5_021E15A8(fieldSystem, 1, &v1->unk_04); (*v2)++; break; @@ -1469,7 +1470,7 @@ static BOOL sub_02054648 (TaskManager * taskMan) switch (*state) { case 0: - Sound_TryFadeInBgm(fieldSystem, v3->mapId); + Sound_TryFadeInBGM(fieldSystem, v3->mapId); sub_020558AC(taskMan); (*state)++; break; @@ -1535,7 +1536,7 @@ static BOOL sub_02054778 (TaskManager * taskMan) switch (v1->unk_00) { case 0: Sound_PlayEffect(1539); - Sound_TryFadeInBgm(fieldSystem, v2->mapId); + Sound_TryFadeInBGM(fieldSystem, v2->mapId); sub_02055974(taskMan); (v1->unk_00)++; break; diff --git a/src/field_menu.c b/src/field_menu.c index 78b20d28ce..15af892c31 100644 --- a/src/field_menu.c +++ b/src/field_menu.c @@ -277,9 +277,9 @@ void FieldMenu_Init (FieldSystem * fieldSystem) { FieldMenu * menu = FieldMenu_Alloc(); - if (sub_0206AE5C(SaveData_GetFieldEvents(fieldSystem->saveData)) == 1) { + if (sub_0206AE5C(SaveData_GetVarsFlags(fieldSystem->saveData)) == 1) { menu->unk_224 = sub_0203AC24(fieldSystem); - } else if (sub_0206AE8C(SaveData_GetFieldEvents(fieldSystem->saveData)) == 1) { + } else if (sub_0206AE8C(SaveData_GetVarsFlags(fieldSystem->saveData)) == 1) { menu->unk_224 = sub_0203AC28(fieldSystem); } else if (sub_0206C0D0(fieldSystem) == 1) { menu->unk_224 = sub_0203AC2C(fieldSystem); @@ -333,9 +333,9 @@ void sub_0203AB00 (FieldSystem * fieldSystem) menu->unk_228 = 0; - if (sub_0206AE5C(SaveData_GetFieldEvents(fieldSystem->saveData)) == 1) { + if (sub_0206AE5C(SaveData_GetVarsFlags(fieldSystem->saveData)) == 1) { menu->unk_224 = sub_0203AC24(fieldSystem); - } else if (sub_0206AE8C(SaveData_GetFieldEvents(fieldSystem->saveData)) == 1) { + } else if (sub_0206AE8C(SaveData_GetVarsFlags(fieldSystem->saveData)) == 1) { menu->unk_224 = sub_0203AC28(fieldSystem); } else if (sub_0206C0D0(fieldSystem) == 1) { menu->unk_224 = sub_0203AC2C(fieldSystem); @@ -372,11 +372,11 @@ static u32 sub_0203ABD0 (FieldSystem * fieldSystem) v0 |= 0x1; } - if (sub_0206B054(SaveData_GetFieldEvents(fieldSystem->saveData)) == 0) { + if (sub_0206B054(SaveData_GetVarsFlags(fieldSystem->saveData)) == 0) { v0 |= 0x2; } - if (sub_0206A938(SaveData_GetFieldEvents(fieldSystem->saveData)) == 0) { + if (sub_0206A938(SaveData_GetVarsFlags(fieldSystem->saveData)) == 0) { v0 |= 0x4; } @@ -666,9 +666,9 @@ static void sub_0203B094 (TaskManager * taskMan) fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); - if (sub_0206AE5C(SaveData_GetFieldEvents(fieldSystem->saveData)) == 1) { + if (sub_0206AE5C(SaveData_GetVarsFlags(fieldSystem->saveData)) == 1) { v6 = 0; - } else if (sub_0206AE8C(SaveData_GetFieldEvents(fieldSystem->saveData)) == 1) { + } else if (sub_0206AE8C(SaveData_GetVarsFlags(fieldSystem->saveData)) == 1) { v6 = 1; } else { return; @@ -722,7 +722,7 @@ static void sub_0203B200 (TaskManager * taskMan) fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); - if ((sub_0206AE5C(SaveData_GetFieldEvents(fieldSystem->saveData)) == 0) && (sub_0206AE8C(SaveData_GetFieldEvents(fieldSystem->saveData)) == 0)) { + if ((sub_0206AE5C(SaveData_GetVarsFlags(fieldSystem->saveData)) == 0) && (sub_0206AE8C(SaveData_GetVarsFlags(fieldSystem->saveData)) == 0)) { return; } @@ -952,14 +952,14 @@ static BOOL FieldMenu_Pokedex (TaskManager * taskMan) UnkStruct_ov21_021D0D80 * v2; PokedexData * v3; TrainerInfo * v4; - FieldEvents * v5; + VarsFlags * v5; fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); v2 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov21_021D0D80)); v3 = SaveData_Pokedex(fieldSystem->saveData); v4 = SaveData_GetTrainerInfo(fieldSystem->saveData); - v5 = SaveData_GetFieldEvents(fieldSystem->saveData); + v5 = SaveData_GetVarsFlags(fieldSystem->saveData); v2->unk_00 = v3; v2->unk_04 = v4; @@ -1625,7 +1625,7 @@ static BOOL FieldMenu_SelectRetire (TaskManager * taskMan) BGL_DeleteWindow(&menu->unk_00); sub_0203B200(taskMan); - if (sub_0206AE5C(SaveData_GetFieldEvents(fieldSystem->saveData)) == 1) { + if (sub_0206AE5C(SaveData_GetVarsFlags(fieldSystem->saveData)) == 1) { sub_0203E918(taskMan, 8821, NULL); } else { sub_0203E918(taskMan, 4, NULL); diff --git a/src/overlay005/fieldmap.c b/src/overlay005/fieldmap.c index fdeafa8b82..8a70c74ec6 100644 --- a/src/overlay005/fieldmap.c +++ b/src/overlay005/fieldmap.c @@ -428,7 +428,7 @@ static BOOL FieldMap_ChangeZone (FieldSystem * fieldSystem) fieldSystem->location->mapId = v0; FieldSystem_LoadMapData(fieldSystem, v0); - FieldSystem_MapChange_UpdateGameData(fieldSystem, 1); + FieldMapChange_UpdateGameData(fieldSystem, 1); } { @@ -481,7 +481,7 @@ void ov5_021D12D0 (FieldSystem * fieldSystem, u32 param1) fieldSystem->location->mapId = param1; FieldSystem_LoadMapData(fieldSystem, param1); - FieldSystem_MapChange_UpdateGameDataDistortionWorld(fieldSystem, 1); + FieldMapChange_UpdateGameDataDistortionWorld(fieldSystem, 1); } { diff --git a/src/overlay005/ov5_021D1C30.c b/src/overlay005/ov5_021D1C30.c index 50f20faf03..ae722ef50a 100644 --- a/src/overlay005/ov5_021D1C30.c +++ b/src/overlay005/ov5_021D1C30.c @@ -183,7 +183,7 @@ int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * fieldSyst if (param0->unk_00_11 == 0) { BOOL v0 = sub_02054AB0(Party_GetFromSavedata(fieldSystem->saveData)); - if (sub_0206A984(SaveData_GetFieldEvents(fieldSystem->saveData)) == 1) { + if (sub_0206A984(SaveData_GetVarsFlags(fieldSystem->saveData)) == 1) { v0 = 1; } @@ -196,7 +196,7 @@ int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * fieldSyst } if (param0->unk_00_6) { - sub_0206A9A4(SaveData_GetFieldEvents(fieldSystem->saveData)); + sub_0206A9A4(SaveData_GetVarsFlags(fieldSystem->saveData)); if (ov5_021D2884(fieldSystem) == 1) { return 1; @@ -207,7 +207,7 @@ int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * fieldSyst int v1 = 0; int v2 = sub_02061308(fieldSystem->playerAvatar, param0->unk_04, param0->unk_06); - if (inline_0204E650_2(SaveData_GetFieldEvents(fieldSystem->saveData))) { + if (inline_0204E650_2(SaveData_GetVarsFlags(fieldSystem->saveData))) { v1 |= 1 << 0; } @@ -599,7 +599,7 @@ static BOOL ov5_021D249C (FieldSystem * fieldSystem) ov5_021D2C7C(fieldSystem, &v0, &v1); - if (sub_0206AE8C(SaveData_GetFieldEvents(fieldSystem->saveData)) == 1) { + if (sub_0206AE8C(SaveData_GetVarsFlags(fieldSystem->saveData)) == 1) { if (sub_02056374(fieldSystem, v0, v1) == 1) { sub_02051450(fieldSystem, sub_0205639C(fieldSystem)); return 1; @@ -829,7 +829,7 @@ static BOOL ov5_021D2884 (FieldSystem * fieldSystem) ov5_021D2B54(fieldSystem); } - sub_0206B238(SaveData_GetFieldEvents(fieldSystem->saveData)); + sub_0206B238(SaveData_GetVarsFlags(fieldSystem->saveData)); return 0; } @@ -932,10 +932,10 @@ static BOOL ov5_021D2B20 (FieldSystem * fieldSystem) static BOOL ov5_021D2B2C (FieldSystem * fieldSystem) { u16 v0; - FieldEvents * v1; + VarsFlags * v1; BOOL v2 = 0; - v1 = SaveData_GetFieldEvents(fieldSystem->saveData); + v1 = SaveData_GetVarsFlags(fieldSystem->saveData); v0 = sub_0206B44C(v1); v0++; @@ -997,7 +997,7 @@ static BOOL ov5_021D2C14 (FieldSystem * fieldSystem) u16 * v0; u16 * v1; - if (sub_0206AE5C(SaveData_GetFieldEvents(fieldSystem->saveData)) == 0) { + if (sub_0206AE5C(SaveData_GetVarsFlags(fieldSystem->saveData)) == 0) { return 0; } diff --git a/src/overlay005/ov5_021DB888.c b/src/overlay005/ov5_021DB888.c index 2929e9a1ef..166578a628 100644 --- a/src/overlay005/ov5_021DB888.c +++ b/src/overlay005/ov5_021DB888.c @@ -34,7 +34,7 @@ typedef struct { typedef struct { u32 unk_00; FieldSystem * fieldSystem; - FieldEvents * unk_08; + VarsFlags * unk_08; const UnkStruct_ov5_021F8E48 * unk_0C; MapObject * unk_10[64]; u16 unk_110; @@ -345,7 +345,7 @@ void ov5_021DB888 (TaskManager * param0, StringTemplate * param1, u16 * param2) memset(v0, 0, sizeof(UnkStruct_ov5_021DBA58)); v0->fieldSystem = fieldSystem; - v0->unk_08 = SaveData_GetFieldEvents(fieldSystem->saveData); + v0->unk_08 = SaveData_GetVarsFlags(fieldSystem->saveData); v0->unk_114 = param2; v0->unk_118 = param1; @@ -531,7 +531,7 @@ static BOOL ov5_021DBB70 (u32 param0) BOOL ov5_021DBB94 (FieldSystem * fieldSystem) { - FieldEvents * v0 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(fieldSystem->saveData); u16 v1 = sub_0206B0E8(v0); u16 v2 = sub_0206B108(v0); @@ -633,7 +633,7 @@ static BOOL ov5_021DBCD4 (UnkStruct_ov5_021DBA58 * param0) static BOOL ov5_021DBCE0 (UnkStruct_ov5_021DBA58 * param0) { - FieldEvents * v0 = SaveData_GetFieldEvents(param0->fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); MapObject * v1; u16 v2; int v3, v4; @@ -734,7 +734,7 @@ static u16 ov5_021DBDFC (FieldSystem * fieldSystem, u16 param1) static u16 ov5_021DBE48 (FieldSystem * fieldSystem, u16 param1, u16 param2) { - FieldEvents * v0 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(fieldSystem->saveData); u16 v1 = param2; switch (param2) { diff --git a/src/overlay005/ov5_021EA714.c b/src/overlay005/ov5_021EA714.c index d0db00ea67..155cb4441c 100644 --- a/src/overlay005/ov5_021EA714.c +++ b/src/overlay005/ov5_021EA714.c @@ -29,7 +29,7 @@ void ov5_021EA714 (FieldSystem * fieldSystem, int param1, u32 param2) void ov5_021EA728 (FieldSystem * fieldSystem) { PoketchData * v0 = SaveData_PoketchData(fieldSystem->saveData); - FieldEvents * v1 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v1 = SaveData_GetVarsFlags(fieldSystem->saveData); if (PoketchData_IsEnabled(v0) && (sub_0206AE2C(v1) == 0)) { @@ -44,7 +44,7 @@ void ov5_021EA728 (FieldSystem * fieldSystem) void ov5_021EA790 (FieldSystem * fieldSystem) { PoketchData * v0 = SaveData_PoketchData(fieldSystem->saveData); - FieldEvents * v1 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v1 = SaveData_GetVarsFlags(fieldSystem->saveData); if (PoketchData_IsEnabled(v0) && (sub_0206AE2C(v1) == 0)) { @@ -57,7 +57,7 @@ void ov5_021EA790 (FieldSystem * fieldSystem) u8 ov5_021EA7CC (FieldSystem * fieldSystem) { PoketchData * v0 = SaveData_PoketchData(fieldSystem->saveData); - FieldEvents * v1 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v1 = SaveData_GetVarsFlags(fieldSystem->saveData); if (PoketchData_IsEnabled(v0) && (sub_0206AE2C(v1) == 0)) { diff --git a/src/overlay005/ov5_021EE7D4.c b/src/overlay005/ov5_021EE7D4.c index 5492ad8092..da3799f930 100644 --- a/src/overlay005/ov5_021EE7D4.c +++ b/src/overlay005/ov5_021EE7D4.c @@ -111,7 +111,7 @@ u8 ov5_021EE920 (FieldSystem * fieldSystem, u16 param1) v3 = Pokemon_GetValue(v0, MON_DATA_SPECIES, NULL); v1 = ov5_021EE7D4(v0); v4 = ov5_021EE8A8(v3, v1); - v2 = sub_0206B0B4(SaveData_GetFieldEvents(fieldSystem->saveData)); + v2 = sub_0206B0B4(SaveData_GetVarsFlags(fieldSystem->saveData)); v5 = ov5_021EE8A8(v3, v2); { @@ -139,7 +139,7 @@ void ov5_021EE9BC (FieldSystem * fieldSystem, u16 param1) v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(fieldSystem->saveData), param1); v1 = ov5_021EE7D4(v0); - sub_0206B0C4(SaveData_GetFieldEvents(fieldSystem->saveData), v1); + sub_0206B0C4(SaveData_GetVarsFlags(fieldSystem->saveData), v1); } static void ov5_021EE9E8 (FieldSystem * fieldSystem, u8 param1, u8 param2, u16 param3, vu16 param4) @@ -162,7 +162,7 @@ void ov5_021EEA54 (FieldSystem * fieldSystem, u8 param1, u8 param2, u16 param3) { vu16 v0; - v0 = sub_0206B0B4(SaveData_GetFieldEvents(fieldSystem->saveData)); + v0 = sub_0206B0B4(SaveData_GetVarsFlags(fieldSystem->saveData)); ov5_021EE9E8(fieldSystem, param1, param2, param3, v0); } diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index e163c2fa93..5f76199c85 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -806,13 +806,13 @@ BOOL ScrCmd_305 (ScriptContext * param0) BOOL ScrCmd_30F (ScriptContext * param0) { - FieldEvents * v0; + VarsFlags * v0; UnkStruct_0202CD88 * v1; FieldSystem * fieldSystem = param0->fieldSystem; u16 v3 = ScriptContext_GetVar(param0); u16 * v4 = ScriptContext_GetVarPointer(param0); - v0 = SaveData_GetFieldEvents(fieldSystem->saveData); + v0 = SaveData_GetVarsFlags(fieldSystem->saveData); v1 = sub_0202CD88(fieldSystem->saveData); *v4 = 1; diff --git a/src/overlay005/ov5_021F8370.c b/src/overlay005/ov5_021F8370.c index c4eb339fb7..b80dca0e37 100644 --- a/src/overlay005/ov5_021F8370.c +++ b/src/overlay005/ov5_021F8370.c @@ -173,7 +173,7 @@ static void ov5_021F8480 (UnkStruct_ov5_021F8480 * param0, const u32 param1) static BOOL ov5_021F8508 (FieldSystem * fieldSystem, u32 param1) { - return sub_0206AF6C(SaveData_GetFieldEvents(fieldSystem->saveData), 2, param1); + return sub_0206AF6C(SaveData_GetVarsFlags(fieldSystem->saveData), 2, param1); } static BOOL ov5_021F851C (int param0, int param1, const UnkStruct_ov5_0220192C * param2, FieldSystem * fieldSystem) diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c index 496e8573dc..82f91ea81b 100644 --- a/src/overlay006/ov6_02240C9C.c +++ b/src/overlay006/ov6_02240C9C.c @@ -299,7 +299,7 @@ BOOL ov6_02240D5C (FieldSystem * fieldSystem) return 0; } - if (!sub_0206A984(SaveData_GetFieldEvents(fieldSystem->saveData))) { + if (!sub_0206A984(SaveData_GetVarsFlags(fieldSystem->saveData))) { v8 = 0; } else { v8 = 1; @@ -324,7 +324,7 @@ BOOL ov6_02240D5C (FieldSystem * fieldSystem) } if (!v8) { - v9 = sub_0206AE5C(SaveData_GetFieldEvents(fieldSystem->saveData)); + v9 = sub_0206AE5C(SaveData_GetVarsFlags(fieldSystem->saveData)); ov6_02242328(fieldSystem, v9, &v0); } else { v0 = sub_02051D8C(11, (0x2 | 0x8 | 0x40)); @@ -355,7 +355,7 @@ BOOL ov6_02240D5C (FieldSystem * fieldSystem) v7 = ov6_02241674(fieldSystem, v1, v0, v12, v13, &v14, &v10); } else { { - v0->trainerIDs[2] = sub_0206B034(SaveData_GetFieldEvents(fieldSystem->saveData)); + v0->trainerIDs[2] = sub_0206B034(SaveData_GetVarsFlags(fieldSystem->saveData)); TrainerData_Encounter(v0, fieldSystem->saveData, 11); } v7 = ov6_0224174C(fieldSystem, v1, v0, v13, &v14); @@ -421,7 +421,7 @@ BOOL ov6_0224106C (FieldSystem * fieldSystem, const int param1, BattleParams ** } } - v2 = sub_0206AE5C(SaveData_GetFieldEvents(fieldSystem->saveData)); + v2 = sub_0206AE5C(SaveData_GetVarsFlags(fieldSystem->saveData)); ov6_02242328(fieldSystem, v2, param2); @@ -523,7 +523,7 @@ BOOL ov6_022411C8 (FieldSystem * fieldSystem, TaskManager * param1) memset(&v9, 0, sizeof(UnkStruct_ov6_02241674)); - if (!sub_0206A984(SaveData_GetFieldEvents(fieldSystem->saveData))) { + if (!sub_0206A984(SaveData_GetVarsFlags(fieldSystem->saveData))) { v6 = 0; } else { v6 = 1; @@ -544,7 +544,7 @@ BOOL ov6_022411C8 (FieldSystem * fieldSystem, TaskManager * param1) } if (!v6) { - v7 = sub_0206AE5C(SaveData_GetFieldEvents(fieldSystem->saveData)); + v7 = sub_0206AE5C(SaveData_GetVarsFlags(fieldSystem->saveData)); ov6_02242328(fieldSystem, v7, &v0); } else { v0 = sub_02051D8C(11, (0x2 | 0x8 | 0x40)); @@ -575,7 +575,7 @@ BOOL ov6_022411C8 (FieldSystem * fieldSystem, TaskManager * param1) v8 = ov6_02241674(fieldSystem, v1, v0, v11, v12, &v13, &v9); } else { { - v0->trainerIDs[2] = sub_0206B034(SaveData_GetFieldEvents(fieldSystem->saveData)); + v0->trainerIDs[2] = sub_0206B034(SaveData_GetVarsFlags(fieldSystem->saveData)); TrainerData_Encounter(v0, fieldSystem->saveData, 11); } v8 = ov6_0224174C(fieldSystem, v1, v0, v12, &v13); @@ -668,7 +668,7 @@ BOOL ov6_022413E4 (FieldSystem * fieldSystem, BattleParams ** param1) memset(&v9, 0, sizeof(UnkStruct_ov6_02241674)); v9.unk_0C = 0; - if (!sub_0206A984(SaveData_GetFieldEvents(fieldSystem->saveData))) { + if (!sub_0206A984(SaveData_GetVarsFlags(fieldSystem->saveData))) { v7 = 0; } else { v7 = 1; @@ -692,7 +692,7 @@ BOOL ov6_022413E4 (FieldSystem * fieldSystem, BattleParams ** param1) } if (!v7) { - v8 = sub_0206AE5C(SaveData_GetFieldEvents(fieldSystem->saveData)); + v8 = sub_0206AE5C(SaveData_GetVarsFlags(fieldSystem->saveData)); ov6_02242328(fieldSystem, v8, param1); } else { *param1 = sub_02051D8C(11, (0x2 | 0x8 | 0x40)); @@ -723,7 +723,7 @@ BOOL ov6_022413E4 (FieldSystem * fieldSystem, BattleParams ** param1) v6 = ov6_02241674(fieldSystem, v0, *param1, v11, v12, &v13, &v9); } else { { - (*param1)->trainerIDs[2] = sub_0206B034(SaveData_GetFieldEvents(fieldSystem->saveData)); + (*param1)->trainerIDs[2] = sub_0206B034(SaveData_GetVarsFlags(fieldSystem->saveData)); TrainerData_Encounter(*param1, fieldSystem->saveData, 11); } v6 = ov6_0224174C(fieldSystem, v0, *param1, v12, &v13); diff --git a/src/overlay006/ov6_02246034.c b/src/overlay006/ov6_02246034.c index 3263b87cac..d2598b0da9 100644 --- a/src/overlay006/ov6_02246034.c +++ b/src/overlay006/ov6_02246034.c @@ -44,10 +44,10 @@ void ov6_02246034 (FieldSystem * fieldSystem, BattleParams * param1) if (((param1->unk_14 == 0x1) && (v0 == 0))) { sub_0202D914(&v4); - sub_0206B688(SaveData_GetFieldEvents(fieldSystem->saveData), v2, 2); + sub_0206B688(SaveData_GetVarsFlags(fieldSystem->saveData), v2, 2); } else if (param1->unk_14 == 0x4) { sub_0202D914(&v4); - sub_0206B688(SaveData_GetFieldEvents(fieldSystem->saveData), v2, 1); + sub_0206B688(SaveData_GetVarsFlags(fieldSystem->saveData), v2, 1); } else { sub_0202D980(v4, 5, v0); sub_0202D980(v4, 7, v1); diff --git a/src/overlay006/ov6_02246A30.c b/src/overlay006/ov6_02246A30.c index e0e82e663b..cdaa8d4ea1 100644 --- a/src/overlay006/ov6_02246A30.c +++ b/src/overlay006/ov6_02246A30.c @@ -97,37 +97,37 @@ static BOOL ov6_02246A34 (FieldSystem * fieldSystem) static BOOL ov6_02246A38 (FieldSystem * fieldSystem) { - FieldEvents * v0 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(fieldSystem->saveData); return inline_0208BE68(v0, 7); } static BOOL ov6_02246A4C (FieldSystem * fieldSystem) { - FieldEvents * v0 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(fieldSystem->saveData); return inline_0208BE68(v0, 2); } static BOOL ov6_02246A60 (FieldSystem * fieldSystem) { - FieldEvents * v0 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(fieldSystem->saveData); return inline_0208BE68(v0, 9); } static BOOL ov6_02246A74 (FieldSystem * fieldSystem) { - FieldEvents * v0 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(fieldSystem->saveData); return inline_0208BE68(v0, 10); } static BOOL ov6_02246A88 (FieldSystem * fieldSystem) { - FieldEvents * v0 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(fieldSystem->saveData); return inline_0208BE68(v0, 11); } static BOOL ov6_02246A9C (FieldSystem * fieldSystem) { - FieldEvents * v0 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(fieldSystem->saveData); return inline_0208BE68(v0, 17); } @@ -156,7 +156,7 @@ static BOOL ov6_02246AD8 (FieldSystem * fieldSystem) static BOOL ov6_02246AE8 (FieldSystem * fieldSystem) { - FieldEvents * v0 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(fieldSystem->saveData); return sub_0206A954(v0); } diff --git a/src/overlay006/ov6_02247F5C.c b/src/overlay006/ov6_02247F5C.c index cacb7d88ea..cb08bec4f8 100644 --- a/src/overlay006/ov6_02247F5C.c +++ b/src/overlay006/ov6_02247F5C.c @@ -18,7 +18,7 @@ void ov6_02247F5C (FieldSystem * fieldSystem) { UnkStruct_ov5_021D3CE4 * v0; - if (!sub_0206ADEC(SaveData_GetFieldEvents(fieldSystem->saveData))) { + if (!sub_0206ADEC(SaveData_GetVarsFlags(fieldSystem->saveData))) { v0 = ov5_021D3DE4(496, 1, fieldSystem->unk_50); ov5_021D3F08(v0, 1); ov5_021D3E40(v0, 1); diff --git a/src/overlay007/ov7_0224CD28.c b/src/overlay007/ov7_0224CD28.c index 3a4f0d4f8f..76b145fe77 100644 --- a/src/overlay007/ov7_0224CD28.c +++ b/src/overlay007/ov7_0224CD28.c @@ -197,7 +197,7 @@ void ov7_0224CDA4 (TaskManager * param0, FieldSystem * fieldSystem, u16 * param2 v0->unk_270 = SaveData_GetTrainerInfo(fieldSystem->saveData); v0->unk_278 = SaveData_Options(fieldSystem->saveData); v0->unk_280 = sub_0202CD88(fieldSystem->saveData); - v0->unk_288 = SaveData_GetFieldEvents(fieldSystem->saveData); + v0->unk_288 = SaveData_GetVarsFlags(fieldSystem->saveData); v0->unk_28C = param4; v0->unk_2A6 = ov7_0224CE90(fieldSystem); v0->unk_27C = fieldSystem->unk_9C; diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c index bdf10f7a9a..7bbf8678f8 100644 --- a/src/overlay008/ov8_02249960.c +++ b/src/overlay008/ov8_02249960.c @@ -2451,13 +2451,13 @@ static __attribute__((aligned(4))) const u8 Unk_ov8_0224CA5C[5][21] = { static void ov8_0224AEDC (FieldSystem * fieldSystem, u16 param1) { - FieldEvents * v0 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(fieldSystem->saveData); sub_0206B46C(v0, param1); } static u32 ov8_0224AEF0 (FieldSystem * fieldSystem) { - FieldEvents * v0 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(fieldSystem->saveData); return sub_0206B47C(v0); } diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c index 8e05aed918..47aa233b81 100644 --- a/src/overlay009/ov9_02249960.c +++ b/src/overlay009/ov9_02249960.c @@ -1352,7 +1352,7 @@ static void ov9_02249CAC (UnkStruct_ov9_02249B04 * param0) static void ov9_02249CC4 (UnkStruct_ov9_02249B04 * param0) { UnkStruct_02071C5C * v0 = param0->unk_04; - FieldEvents * v1 = SaveData_GetFieldEvents(param0->fieldSystem->saveData); + VarsFlags * v1 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); v0->unk_0C = 0; @@ -2104,7 +2104,7 @@ BOOL ov9_0224A67C (FieldSystem * fieldSystem, int param1) switch (v1) { case 581: if (param1 == 0) { - FieldEvents * v2 = SaveData_GetFieldEvents(v0->fieldSystem->saveData); + VarsFlags * v2 = SaveData_GetVarsFlags(v0->fieldSystem->saveData); if (sub_0206B5D8(v2) >= 10) { int v3, v4, v5; @@ -2162,7 +2162,7 @@ BOOL ov9_0224A71C (FieldSystem * fieldSystem) { u32 v6 = ov9_022510D0(v5); - FieldEvents * v7 = SaveData_GetFieldEvents(v5->fieldSystem->saveData); + VarsFlags * v7 = SaveData_GetVarsFlags(v5->fieldSystem->saveData); if ((v6 == 581) && (v4 == 0)) { if (sub_0206B5D8(v7) >= 10) { @@ -2191,7 +2191,7 @@ BOOL ov9_0224A800 (FieldSystem * fieldSystem, int param1) switch (v1) { case 581: if (param1 == 0) { - FieldEvents * v2 = SaveData_GetFieldEvents(v0->fieldSystem->saveData); + VarsFlags * v2 = SaveData_GetVarsFlags(v0->fieldSystem->saveData); if (sub_0206B5D8(v2) >= 10) { int v3, v4, v5; @@ -2788,7 +2788,7 @@ static void ov9_0224B1B4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov5_021DF47 param0->unk_1EC2 = 0; if (ov9_022510D0(param0) == 582) { - FieldEvents * v3 = SaveData_GetFieldEvents(param0->fieldSystem->saveData); + VarsFlags * v3 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); u32 v4 = sub_0206B5D8(v3); if (v4 >= 10) { @@ -4963,7 +4963,7 @@ static int ov9_0224D0C8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 param1->unk_06 = v2->unk_08; { - FieldEvents * v4 = SaveData_GetFieldEvents(param0->fieldSystem->saveData); + VarsFlags * v4 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); u16 v5 = sub_0206B5D8(v4); if ((v0 == 573) && (v5 == 2)) { @@ -5283,7 +5283,7 @@ static int ov9_0224D5E8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 } if ((param1->unk_06 == 577) && (param1->unk_00 == 1) && (param1->unk_64->unk_04.unk_00 == 1)) { - FieldEvents * v1 = SaveData_GetFieldEvents(param0->fieldSystem->saveData); + VarsFlags * v1 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); if (sub_0206B6DC(v1) == 0) { param1->unk_04 = 6; @@ -5342,14 +5342,14 @@ static int ov9_0224D69C (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 static int ov9_0224D6E0 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 * param1) { if (sub_0206574C(param1->unk_6C) == 1) { - FieldEvents * v0; + VarsFlags * v0; MapObject * v1; sub_02065758(param1->unk_6C); v1 = MapObjMan_LocalMapObjByIndex(param0->fieldSystem->mapObjMan, (0x80 + 6)); ov9_0224EE70(param0, v1); - v0 = SaveData_GetFieldEvents(param0->fieldSystem->saveData); + v0 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); sub_0206B6EC(v0, 1); return 2; @@ -6085,7 +6085,7 @@ static int ov9_0224E1CC (UnkStruct_ov101_021D5D90 * param0, void * param1) v1->unk_00 = 0; if (v2->unk_08 == 1) { - FieldEvents * v5 = SaveData_GetFieldEvents(v2->unk_0C->fieldSystem->saveData); + VarsFlags * v5 = SaveData_GetVarsFlags(v2->unk_0C->fieldSystem->saveData); if (sub_0206AFD0(v5) == 0) { v1->unk_02 = 0; @@ -6113,9 +6113,9 @@ static void ov9_0224E294 (UnkStruct_ov101_021D5D90 * param0, void * param1) UnkStruct_ov9_0224E1CC * v0 = param1; if (v0->unk_00 == 1) { - FieldEvents * v1; + VarsFlags * v1; - v1 = SaveData_GetFieldEvents(v0->unk_10.unk_0C->fieldSystem->saveData); + v1 = SaveData_GetVarsFlags(v0->unk_10.unk_0C->fieldSystem->saveData); if (sub_0206AFD0(v1) == 1) { v0->unk_01 = 0; @@ -6264,7 +6264,7 @@ static const UnkStruct_ov9_02252044 * ov9_0224E410 (u32 param0) static BOOL ov9_0224E434 (UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3) { - FieldEvents * v0 = SaveData_GetFieldEvents(param0->fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); const UnkStruct_ov9_02252044 * v1 = ov9_0224E410(ov9_022510D0(param0)); if (v1 != NULL) { @@ -7161,7 +7161,7 @@ static BOOL ov9_0224EF30 (UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0 { u16 v0 = param1->unk_00; u16 v1 = param1->unk_02; - FieldEvents * v2 = SaveData_GetFieldEvents(param0->fieldSystem->saveData); + VarsFlags * v2 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); if (v0 == 6) { if (param2 == 0) { @@ -7657,7 +7657,7 @@ static BOOL ov9_0224F3BC (UnkStruct_ov9_0224F6EC * param0) param0->unk_00, 8); if (v17 >= 3) { - FieldEvents * v18 = SaveData_GetFieldEvents(param0->fieldSystem->saveData); + VarsFlags * v18 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); sub_0206AFC0(v18, 1); } @@ -7788,7 +7788,7 @@ static void ov9_0224F724 (UnkStruct_ov9_02249B04 * param0) u32 v1 = ov9_022510D0(param0); if (v1 == 582) { - FieldEvents * v2 = SaveData_GetFieldEvents(param0->fieldSystem->saveData); + VarsFlags * v2 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); if (sub_0206B5D8(v2) == 13) { v0->unk_06 = 1; @@ -8707,7 +8707,7 @@ static const UnkFuncPtr_ov9_02253BE4 Unk_ov9_022512C0[2] = { static int ov9_022506D0 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) { const UnkStruct_ov9_022506D0 * v0 = param3; - FieldEvents * v1 = SaveData_GetFieldEvents(param0->fieldSystem->saveData); + VarsFlags * v1 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); sub_0206B5E8(v1, v0->unk_00); return 2; @@ -8720,7 +8720,7 @@ static const UnkFuncPtr_ov9_02253BE4 Unk_ov9_02251238[1] = { static int ov9_022506EC (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) { const UnkStruct_ov9_022506EC * v0 = param3; - FieldEvents * v1 = SaveData_GetFieldEvents(param0->fieldSystem->saveData); + VarsFlags * v1 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); sub_0206AFB0(v1, 1, v0->unk_00); return 2; @@ -9634,7 +9634,7 @@ static int ov9_022510D8 (u32 param0) static BOOL ov9_02251104 (UnkStruct_ov9_02249B04 * param0, u32 param1, u32 param2) { - FieldEvents * v0 = SaveData_GetFieldEvents(param0->fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); switch (param1) { case 0: @@ -9685,7 +9685,7 @@ BOOL ov9_022511A0 (FieldSystem * fieldSystem, int param1, int param2, int param3 if (ov9_022510D0(v0) == 582) { if ((param2 == 15) && (param1 == 15) && (param3 == 1)) { - FieldEvents * v1 = SaveData_GetFieldEvents(v0->fieldSystem->saveData); + VarsFlags * v1 = SaveData_GetVarsFlags(v0->fieldSystem->saveData); u32 v2 = sub_0206B5D8(v1); if (v2 == 14) { diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c index 9bf7bbcac1..34fd1d8e5c 100644 --- a/src/overlay023/ov23_0223E140.c +++ b/src/overlay023/ov23_0223E140.c @@ -1687,7 +1687,7 @@ static void ov23_0223F70C (FieldSystem * fieldSystem) v0->fieldSystem = fieldSystem; ov5_021EF3FC(fieldSystem->unk_04->unk_1C); - sub_0206AA04(SaveData_GetFieldEvents(fieldSystem->saveData)); + sub_0206AA04(SaveData_GetVarsFlags(fieldSystem->saveData)); Unk_ov23_02257740->unk_8CC = SysTask_Start(ov23_0223F118, v0, 100); } @@ -2619,7 +2619,7 @@ static BOOL ov23_02240A90 (UnkStruct_ov23_0223EE80 * param0) if ((v2 >= 23) && ((28 + 1) > v2) || (v2 == 36) || (v2 == 37)) { sub_02029644(v3, 1); { - FieldEvents * v5 = SaveData_GetFieldEvents(Unk_ov23_02257740->fieldSystem->saveData); + VarsFlags * v5 = SaveData_GetVarsFlags(Unk_ov23_02257740->fieldSystem->saveData); sub_0206B41C(v5, sub_0206B40C(v5) + 1); } diff --git a/src/overlay023/ov23_022416A8.c b/src/overlay023/ov23_022416A8.c index e0a39b403c..edf7c8295c 100644 --- a/src/overlay023/ov23_022416A8.c +++ b/src/overlay023/ov23_022416A8.c @@ -399,7 +399,7 @@ void ov23_02241AE8 (int param0, int param1, int param2, int param3) ov23_02250128(param0); Sound_PlayEffect(1585); - sub_0206AA14(SaveData_GetFieldEvents(Unk_ov23_02257744->fieldSystem->saveData)); + sub_0206AA14(SaveData_GetVarsFlags(Unk_ov23_02257744->fieldSystem->saveData)); sub_0202CF28(sub_0202CD88(Unk_ov23_02257744->fieldSystem->saveData), (1 + 46)); ov5_021F57C8(Unk_ov23_02257744->fieldSystem, param2, param3); diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c index b2b94c777f..4959e7ebd2 100644 --- a/src/overlay023/ov23_02241F74.c +++ b/src/overlay023/ov23_02241F74.c @@ -154,7 +154,7 @@ static void CommManUnderground_Init (CommManUnderground * param0, FieldSystem * sCommManUnderground->unk_DC[v1] = NULL; } - sub_0206A9F4(SaveData_GetFieldEvents(sCommManUnderground->fieldSystem->saveData)); + sub_0206A9F4(SaveData_GetVarsFlags(sCommManUnderground->fieldSystem->saveData)); sCommManUnderground->unk_14 = SysTask_Start(ov23_02243310, NULL, 0); sub_02032110(ov23_022433F4); } diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c index 560d753bdc..192df1df5e 100644 --- a/src/overlay023/ov23_0224340C.c +++ b/src/overlay023/ov23_0224340C.c @@ -1597,7 +1597,7 @@ void ov23_0224448C (int param0, int param1, void * param2, void * param3) } { - FieldEvents * v2 = SaveData_GetFieldEvents(Unk_ov23_02257764->fieldSystem->saveData); + VarsFlags * v2 = SaveData_GetVarsFlags(Unk_ov23_02257764->fieldSystem->saveData); sub_0206B43C(v2, sub_0206B42C(v2) + 1); } diff --git a/src/overlay023/ov23_022499E4.c b/src/overlay023/ov23_022499E4.c index aa27e37088..a55450da82 100644 --- a/src/overlay023/ov23_022499E4.c +++ b/src/overlay023/ov23_022499E4.c @@ -78,7 +78,7 @@ void ov23_022499E8 (FieldSystem * fieldSystem) v0 = FieldCommMan_Get(); Heap_Create(3, 33, 0xe800); - if (!sub_0206ADDC(SaveData_GetFieldEvents(v0->fieldSystem->saveData))) { + if (!sub_0206ADDC(SaveData_GetVarsFlags(v0->fieldSystem->saveData))) { sub_02036894(); } } @@ -270,7 +270,7 @@ static void ov23_02249C34 (void) ov23_02243AF0(); ov23_0224C21C(); - if (!sub_0206ADDC(SaveData_GetFieldEvents(v0->fieldSystem->saveData))) { + if (!sub_0206ADDC(SaveData_GetVarsFlags(v0->fieldSystem->saveData))) { ov23_02249C24(ov23_02249C98, 0); } else { sub_02059524(); @@ -282,7 +282,7 @@ static void ov23_02249C98 (void) { FieldCommunicationManager * v0 = FieldCommMan_Get(); - if (!sub_0206ADDC(SaveData_GetFieldEvents(v0->fieldSystem->saveData))) { + if (!sub_0206ADDC(SaveData_GetVarsFlags(v0->fieldSystem->saveData))) { return; } diff --git a/src/overlay023/ov23_0224A1D0.c b/src/overlay023/ov23_0224A1D0.c index e9209afc8a..833300a52e 100644 --- a/src/overlay023/ov23_0224A1D0.c +++ b/src/overlay023/ov23_0224A1D0.c @@ -205,7 +205,7 @@ void ov23_0224A410 (int param0, int param1, void * param2, void * param3) { CommPlayerManager * commPlayerMan = CommPlayerMan_Get(); UnkStruct_ov23_0224A348 * v1 = param2; - FieldEvents * v2 = SaveData_GetFieldEvents(commPlayerMan->fieldSystem->saveData); + VarsFlags * v2 = SaveData_GetVarsFlags(commPlayerMan->fieldSystem->saveData); GF_ASSERT(v1->unk_01 < (7 + 1)); @@ -473,7 +473,7 @@ void ov23_0224A77C (int param0, int param1, void * param2, void * param3) u8 v6 = sub_0202958C(v5); sub_020295C0(v5); - sub_0206AA40(SaveData_GetFieldEvents(commPlayerMan->fieldSystem->saveData)); + sub_0206AA40(SaveData_GetVarsFlags(commPlayerMan->fieldSystem->saveData)); if (commPlayerMan->unk_290[v1->unk_01]) { sub_0206DAB8(commPlayerMan->fieldSystem, commPlayerMan->unk_290[v1->unk_01]); diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c index eaf4435c09..50d4c488cc 100644 --- a/src/overlay023/ov23_0224B05C.c +++ b/src/overlay023/ov23_0224B05C.c @@ -2171,7 +2171,7 @@ static void ov23_0224D238 (void) v16[0][0] = 16; v16[0][1] = 12; - sub_0206AA20(SaveData_GetFieldEvents(Unk_ov23_022577AC->fieldSystem->saveData)); + sub_0206AA20(SaveData_GetVarsFlags(Unk_ov23_022577AC->fieldSystem->saveData)); sub_020292CC(v0); sub_02028B34(v1); CommSys_Seed(&v15); diff --git a/src/overlay023/ov23_0224DC40.c b/src/overlay023/ov23_0224DC40.c index 26c49752c5..e11999e676 100644 --- a/src/overlay023/ov23_0224DC40.c +++ b/src/overlay023/ov23_0224DC40.c @@ -736,7 +736,7 @@ static void ov23_0224E2D8 (SysTask * param0, void * param1) case 22: ov23_0224E124(v0); { - FieldEvents * v2 = SaveData_GetFieldEvents(v0->fieldSystem->saveData); + VarsFlags * v2 = SaveData_GetVarsFlags(v0->fieldSystem->saveData); sub_0206B3FC(v2, sub_0206B3EC(v2) + 1); } diff --git a/src/overlay023/ov23_0225128C.c b/src/overlay023/ov23_0225128C.c index 891f75f2d7..f0e436263a 100644 --- a/src/overlay023/ov23_0225128C.c +++ b/src/overlay023/ov23_0225128C.c @@ -650,7 +650,7 @@ static BOOL ov23_02251ACC (TaskManager * param0) case 5: if (ScreenWipe_Done()) { ov23_0224B2C8(fieldSystem); - sub_0206AA30(SaveData_GetFieldEvents(fieldSystem->saveData)); + sub_0206AA30(SaveData_GetVarsFlags(fieldSystem->saveData)); ov23_02251F94(fieldSystem); Heap_FreeToHeap(v1); return 1; diff --git a/src/overlay047/ov47_022561C0.c b/src/overlay047/ov47_022561C0.c index b73a97b338..50d601427e 100644 --- a/src/overlay047/ov47_022561C0.c +++ b/src/overlay047/ov47_022561C0.c @@ -96,7 +96,7 @@ static BOOL ov47_0225621C (UnkStruct_ov47_0225621C * param0, PoketchSystem * par param0->unk_04.unk_08 = 0; { - FieldEvents * v1 = SaveData_GetFieldEvents(PoketchSystem_SaveData(param1)); + VarsFlags * v1 = SaveData_GetVarsFlags(PoketchSystem_SaveData(param1)); for (v0 = 0; v0 < 4; v0++) { param0->unk_04.unk_2C[v0] = sub_0206B1F0(v1, v0); diff --git a/src/overlay048/ov48_022561C0.c b/src/overlay048/ov48_022561C0.c index 7d5ce38ddb..6c3a0328bd 100644 --- a/src/overlay048/ov48_022561C0.c +++ b/src/overlay048/ov48_022561C0.c @@ -355,7 +355,7 @@ static BOOL ov48_02256478 (UnkStruct_ov48_0225621C * param0) static void ov48_022564E0 (UnkStruct_ov48_0225621C * param0, PoketchSystem * param1) { - FieldEvents * v0 = SaveData_GetFieldEvents(PoketchSystem_SaveData(param1)); + VarsFlags * v0 = SaveData_GetVarsFlags(PoketchSystem_SaveData(param1)); int v1; for (v1 = 0; v1 < 4; v1++) { diff --git a/src/overlay057/ov57_021D0F30.c b/src/overlay057/ov57_021D0F30.c index 20fc06979c..94655ff65f 100644 --- a/src/overlay057/ov57_021D0F30.c +++ b/src/overlay057/ov57_021D0F30.c @@ -28,5 +28,5 @@ void ov57_021D0F44 (int param0, SaveData * param1) v0 = SaveData_GetTrainerInfo(param1); TrainerInfo_SetMoney(v0, 3000); - sub_0206A92C(SaveData_GetFieldEvents(param1)); + sub_0206A92C(SaveData_GetVarsFlags(param1)); } diff --git a/src/overlay062/ov62_02236CBC.c b/src/overlay062/ov62_02236CBC.c index edaa2c01a5..b44f727025 100644 --- a/src/overlay062/ov62_02236CBC.c +++ b/src/overlay062/ov62_02236CBC.c @@ -230,7 +230,7 @@ static void ov62_0223712C (UnkStruct_0208C06C * param0) int v6[5]; { - FieldEvents * v7 = SaveData_GetFieldEvents(param0->unk_830); + VarsFlags * v7 = SaveData_GetVarsFlags(param0->unk_830); v6[0] = sub_0206B5C8(v7); v6[1] = sub_0206B588(v7); @@ -326,7 +326,7 @@ static void ov62_022371CC (UnkStruct_0208C06C * param0) v9.priority = 20; { - FieldEvents * v10 = SaveData_GetFieldEvents(param0->unk_830); + VarsFlags * v10 = SaveData_GetVarsFlags(param0->unk_830); v3[0] = sub_0206B5C8(v10); v3[1] = sub_0206B588(v10); diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c index 84c2969d53..2d59d03ad7 100644 --- a/src/overlay064/ov64_0222DCE0.c +++ b/src/overlay064/ov64_0222DCE0.c @@ -3174,7 +3174,7 @@ static void ov64_0223087C (UnkStruct_ov64_02230620 * param0, UnkStruct_ov64_0222 static void ov64_022308DC (UnkStruct_ov64_02230904 * param0, UnkStruct_ov64_0222E060 * param1, UnkStruct_ov64_0222E21C * param2, u32 param3) { - param0->unk_10 = inline_0208BE68(SaveData_GetFieldEvents(param1->unk_00), 53); + param0->unk_10 = inline_0208BE68(SaveData_GetVarsFlags(param1->unk_00), 53); ov64_02230B1C(param0, param1, param2, param3); } diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index e08b9ebe8c..013ae27b6a 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -402,7 +402,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov65_0223894C = { static BOOL ov65_0222DCE0 (UnkStruct_ov65_0222EBE0 * param0) { - return inline_0208BE68(SaveData_GetFieldEvents(param0->unk_160), 53); + return inline_0208BE68(SaveData_GetVarsFlags(param0->unk_160), 53); } static BOOL ov65_0222DCF8 (UnkStruct_ov65_0222EBE0 * param0) diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index 67f69a3069..23ddac3c93 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -2503,7 +2503,7 @@ static void ov88_0223E694 (Party * param0, Party * param1, int param2, int param if (Pokemon_GetValue(v1, MON_DATA_SPECIES, NULL) == SPECIES_ARCEUS) { if (Pokemon_GetValue(v1, MON_DATA_FATEFUL_ENCOUNTER, NULL) || ((Pokemon_GetValue(v1, MON_DATA_HATCH_LOCATION, NULL) == 86) && (Pokemon_GetValue(v1, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 0))) { - FieldEvents * v2 = SaveData_GetFieldEvents(param4->unk_10); + VarsFlags * v2 = SaveData_GetVarsFlags(param4->unk_10); if (sub_0206B5F8(v2) == 0) { sub_0206B608(v2, 1); diff --git a/src/overlay094/ov94_02242AD0.c b/src/overlay094/ov94_02242AD0.c index 1013ae79b3..0299ce6985 100644 --- a/src/overlay094/ov94_02242AD0.c +++ b/src/overlay094/ov94_02242AD0.c @@ -1291,7 +1291,7 @@ static void ov94_02243BC4 (UnkStruct_ov94_0223FD4C * param0, Pokemon * param1, i if (Pokemon_GetValue(param1, MON_DATA_SPECIES, NULL) == SPECIES_ARCEUS) { if (Pokemon_GetValue(param1, MON_DATA_FATEFUL_ENCOUNTER, NULL) || ((Pokemon_GetValue(param1, MON_DATA_HATCH_LOCATION, NULL) == 86) && (Pokemon_GetValue(param1, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 0))) { - FieldEvents * v2 = SaveData_GetFieldEvents(param0->unk_00->unk_20); + VarsFlags * v2 = SaveData_GetVarsFlags(param0->unk_00->unk_20); if (sub_0206B5F8(v2) == 0) { sub_0206B608(v2, 1); @@ -1338,7 +1338,7 @@ static void ov94_02243CE4 (UnkStruct_ov94_0223FD4C * param0, Pokemon * param1, i if (Pokemon_GetValue(param1, MON_DATA_SPECIES, NULL) == SPECIES_ARCEUS) { if (Pokemon_GetValue(param1, MON_DATA_FATEFUL_ENCOUNTER, NULL) || ((Pokemon_GetValue(param1, MON_DATA_HATCH_LOCATION, NULL) == 86) && (Pokemon_GetValue(param1, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 0))) { - FieldEvents * v0 = SaveData_GetFieldEvents(param0->unk_00->unk_20); + VarsFlags * v0 = SaveData_GetVarsFlags(param0->unk_00->unk_20); if (sub_0206B5F8(v0) == 0) { sub_0206B608(v0, 1); diff --git a/src/overlay098/ov98_02246C20.c b/src/overlay098/ov98_02246C20.c index 266772c674..45cb2e5ca8 100644 --- a/src/overlay098/ov98_02246C20.c +++ b/src/overlay098/ov98_02246C20.c @@ -445,7 +445,7 @@ static void ov98_02247198 (UnkStruct_ov98_02246E88 * param0) v0 = param0->unk_98; if (sub_02039074(param0->unk_04)) { - sub_0206AF5C(SaveData_GetFieldEvents(param0->unk_04)); + sub_0206AF5C(SaveData_GetVarsFlags(param0->unk_04)); } Heap_FreeToHeap(param0->unk_98); diff --git a/src/overlay104/ov104_0222FBE4.c b/src/overlay104/ov104_0222FBE4.c index 63cb86a51f..c8930c6bd9 100644 --- a/src/overlay104/ov104_0222FBE4.c +++ b/src/overlay104/ov104_0222FBE4.c @@ -2060,7 +2060,7 @@ BOOL ov104_022310EC (UnkStruct_ov104_0222E930 * param0) u16 v2 = ov104_0222FC00(param0); UnkStruct_ov104_02230BE4 * v3 = sub_0209B970(param0->unk_00->unk_00); - v0 = sub_020508B8(SaveData_GetFieldEvents(v3->unk_08), v1); + v0 = sub_020508B8(SaveData_GetVarsFlags(v3->unk_08), v1); *v0 = v2; return 0; @@ -2073,7 +2073,7 @@ BOOL ov104_02231118 (UnkStruct_ov104_0222E930 * param0) u16 * v2 = ov104_0222FBE4(param0); UnkStruct_ov104_02230BE4 * v3 = sub_0209B970(param0->unk_00->unk_00); - v0 = sub_020508B8(SaveData_GetFieldEvents(v3->unk_08), v1); + v0 = sub_020508B8(SaveData_GetVarsFlags(v3->unk_08), v1); *v2 = *v0; return 0; diff --git a/src/overlay104/ov104_022339B4.c b/src/overlay104/ov104_022339B4.c index a3807df988..4f1e9d3d53 100644 --- a/src/overlay104/ov104_022339B4.c +++ b/src/overlay104/ov104_022339B4.c @@ -87,7 +87,7 @@ UnkStruct_ov104_0223ADA0 * ov104_022339B4 (SaveData * param0, u16 param1, u8 par v6 = 104; } - v3 = sub_0206B6FC(SaveData_GetFieldEvents(v7->unk_4F8)); + v3 = sub_0206B6FC(SaveData_GetVarsFlags(v7->unk_4F8)); } else { v3 = (u8)sub_020300E0(v1, 10, (v7->unk_05 * 4) + v7->unk_04, NULL); } diff --git a/src/overlay104/ov104_02234DB4.c b/src/overlay104/ov104_02234DB4.c index cd985de306..854f789a81 100644 --- a/src/overlay104/ov104_02234DB4.c +++ b/src/overlay104/ov104_02234DB4.c @@ -76,7 +76,7 @@ UnkStruct_ov104_0223B5C0 * ov104_02234DB4 (SaveData * param0, u16 param1, u8 par sub_02030108(v0); if (v10->unk_04 == 3) { - v2 = sub_0206B6FC(SaveData_GetFieldEvents(v10->unk_6FC)); + v2 = sub_0206B6FC(SaveData_GetVarsFlags(v10->unk_6FC)); } else { v2 = (u8)sub_020302B4(v1, 5, v10->unk_04, 0, NULL); } diff --git a/src/overlay104/ov104_022361B4.c b/src/overlay104/ov104_022361B4.c index 3926efc668..1b80ed942a 100644 --- a/src/overlay104/ov104_022361B4.c +++ b/src/overlay104/ov104_022361B4.c @@ -97,7 +97,7 @@ UnkStruct_ov104_0223BA10 * ov104_022361B4 (SaveData * param0, u16 param1, u8 par sub_020302D0(v4); if (v9->unk_10 == 3) { - v5 = sub_0206B6FC(SaveData_GetFieldEvents(v9->unk_04)); + v5 = sub_0206B6FC(SaveData_GetVarsFlags(v9->unk_04)); } else { v5 = (u8)sub_02030470(v10, 9, v9->unk_10, 0, NULL); } diff --git a/src/overlay104/ov104_02237DD8.c b/src/overlay104/ov104_02237DD8.c index 7af4d8e9c4..f0ece51a4c 100644 --- a/src/overlay104/ov104_02237DD8.c +++ b/src/overlay104/ov104_02237DD8.c @@ -174,7 +174,7 @@ UnkStruct_ov104_0223BFFC * ov104_02237DD8 (SaveData * param0, u16 param1, u8 par sub_02030494(v4); if (v9->unk_10 == 3) { - v5 = sub_0206B6FC(SaveData_GetFieldEvents(v9->unk_04)); + v5 = sub_0206B6FC(SaveData_GetVarsFlags(v9->unk_04)); } else { v5 = (u8)sub_02030600(v10, 8, v9->unk_10, 0, NULL); } diff --git a/src/pokemon_summary_app.c b/src/pokemon_summary_app.c index 8a10858543..2ea69e1d78 100644 --- a/src/pokemon_summary_app.c +++ b/src/pokemon_summary_app.c @@ -135,7 +135,7 @@ const OverlayManagerTemplate Unk_020F410C = { BOOL PokemonSummary_ShowContestData(SaveData * param0) { - return EventFlag_VisitedContestHall(SaveData_GetFieldEvents(param0)); + return EventFlag_VisitedContestHall(SaveData_GetVarsFlags(param0)); } static int sub_0208C330 (OverlayManager * param0, int * param1) diff --git a/src/savedata/save_table.c b/src/savedata/save_table.c index c005ae5c97..ade07631f0 100644 --- a/src/savedata/save_table.c +++ b/src/savedata/save_table.c @@ -50,7 +50,7 @@ const SaveTableEntry gSaveTable[] = { { SAVE_TABLE_ENTRY_PLAYER, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Player_SaveSize, (SaveEntryInitFunc)Player_Init }, { SAVE_TABLE_ENTRY_PARTY, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Party_SaveSize, (SaveEntryInitFunc)Party_Init }, { SAVE_TABLE_ENTRY_BAG, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Bag_SaveSize, (SaveEntryInitFunc)Bag_Init }, - { SAVE_TABLE_ENTRY_EVENTS, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)FieldEvents_SaveSize, (SaveEntryInitFunc)FieldEvents_Init }, + { SAVE_TABLE_ENTRY_EVENTS, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)VarsFlags_Size, (SaveEntryInitFunc)VarsFlags_Init }, { SAVE_TABLE_ENTRY_POKETCH, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Poketch_SaveSize, (SaveEntryInitFunc)Poketch_Init }, { SAVE_TABLE_ENTRY_FIELD_PLAYER_STATE, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)FieldOverworldState_Size, (SaveEntryInitFunc)FieldOverworldState_Init }, { SAVE_TABLE_ENTRY_POKEDEX, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Pokedex_SaveSize, (SaveEntryInitFunc)Pokedex_Init }, diff --git a/src/unk_0202440C.c b/src/unk_0202440C.c index 95bb1cbdc7..549eaf34e8 100644 --- a/src/unk_0202440C.c +++ b/src/unk_0202440C.c @@ -60,7 +60,7 @@ const SaveTableEntry gSaveTable[] = { { SAVE_TABLE_ENTRY_PLAYER, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Player_SaveSize, (SaveEntryInitFunc)Player_Init }, { SAVE_TABLE_ENTRY_PARTY, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Party_SaveSize, (SaveEntryInitFunc)Party_Init }, { SAVE_TABLE_ENTRY_BAG, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Bag_SaveSize, (SaveEntryInitFunc)Bag_Init }, - { SAVE_TABLE_ENTRY_EVENTS, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)FieldEvents_SaveSize, (SaveEntryInitFunc)FieldEvents_Init }, + { SAVE_TABLE_ENTRY_EVENTS, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)VarsFlags_Size, (SaveEntryInitFunc)VarsFlags_Init }, { SAVE_TABLE_ENTRY_POKETCH, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Poketch_SaveSize, (SaveEntryInitFunc)Poketch_Init }, { SAVE_TABLE_ENTRY_FIELD_PLAYER_STATE, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)FieldOverworldState_Size, (SaveEntryInitFunc)FieldOverworldState_Init }, { SAVE_TABLE_ENTRY_POKEDEX, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Pokedex_SaveSize, (SaveEntryInitFunc)Pokedex_Init }, diff --git a/src/unk_0203A7D8.c b/src/unk_0203A7D8.c index 662eab93ff..c8324a4163 100644 --- a/src/unk_0203A7D8.c +++ b/src/unk_0203A7D8.c @@ -134,7 +134,7 @@ void sub_0203A8E8 (FieldSystem * fieldSystem, int param1) for (v0 = 0; v0 < NELEMS(Unk_020E97B4); v0++) { if ((Unk_020E97B4[v0].unk_06 == param1) && Unk_020E97B4[v0].unk_0D) { - inline_0203A8E8(SaveData_GetFieldEvents(fieldSystem->saveData), Unk_020E97B4[v0].unk_0E); + inline_0203A8E8(SaveData_GetVarsFlags(fieldSystem->saveData), Unk_020E97B4[v0].unk_0E); return; } } @@ -143,5 +143,5 @@ void sub_0203A8E8 (FieldSystem * fieldSystem, int param1) BOOL sub_0203A920 (FieldSystem * fieldSystem, int param1) { int v0 = sub_0203A7D8(param1); - return inline_0208BE68(SaveData_GetFieldEvents(fieldSystem->saveData), Unk_020E97B4[v0].unk_0E); + return inline_0208BE68(SaveData_GetVarsFlags(fieldSystem->saveData), Unk_020E97B4[v0].unk_0E); } diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c index 2d19e1f253..5773dc3e19 100644 --- a/src/unk_0203D1B8.c +++ b/src/unk_0203D1B8.c @@ -1578,7 +1578,7 @@ BOOL sub_0203E348 (FieldSystem * fieldSystem, UnkStruct_0203E348 * param1) static BOOL sub_0203E35C (TaskManager * param0) { FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - FieldEvents * v1 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v1 = SaveData_GetVarsFlags(fieldSystem->saveData); UnkStruct_0203E35C * v2 = TaskManager_Environment(param0); int * v3 = FieldTask_GetState(param0); int v4; @@ -1788,7 +1788,7 @@ void * sub_0203E63C (int param0, FieldSystem * fieldSystem, u16 param2, u16 para v0->mode = 2; v0->ribbons = sub_0202D79C(fieldSystem->saveData); v0->dexMode = sub_0207A274(fieldSystem->saveData); - v0->contest = EventFlag_VisitedContestHall(SaveData_GetFieldEvents(fieldSystem->saveData)); + v0->contest = EventFlag_VisitedContestHall(SaveData_GetVarsFlags(fieldSystem->saveData)); v0->chatotCry = NULL; PokemonSummary_FlagVisiblePages(v0, Unk_020EA15C); diff --git a/src/unk_0203E880.c b/src/unk_0203E880.c index 7e2628abc8..c1633740cf 100644 --- a/src/unk_0203E880.c +++ b/src/unk_0203E880.c @@ -594,9 +594,9 @@ static u32 sub_0203F110 (int param0) u16 * sub_0203F118 (FieldSystem * fieldSystem, u16 param1) { - FieldEvents * v0; + VarsFlags * v0; - v0 = SaveData_GetFieldEvents(fieldSystem->saveData); + v0 = SaveData_GetVarsFlags(fieldSystem->saveData); if (param1 < 0x4000) { return NULL; @@ -628,27 +628,27 @@ u16 sub_0203F164 (FieldSystem * fieldSystem, u16 param1) BOOL sub_0203F188 (FieldSystem * fieldSystem, u16 param1) { - return sub_020507F0(SaveData_GetFieldEvents(fieldSystem->saveData), param1); + return sub_020507F0(SaveData_GetVarsFlags(fieldSystem->saveData), param1); } void sub_0203F19C (FieldSystem * fieldSystem, u16 param1) { - sub_0205081C(SaveData_GetFieldEvents(fieldSystem->saveData), param1); + sub_0205081C(SaveData_GetVarsFlags(fieldSystem->saveData), param1); return; } void sub_0203F1B0 (FieldSystem * fieldSystem, u16 param1) { - sub_02050844(SaveData_GetFieldEvents(fieldSystem->saveData), param1); + sub_02050844(SaveData_GetVarsFlags(fieldSystem->saveData), param1); return; } void FieldSystem_ClearLocalFlags (FieldSystem * fieldSystem) { int v0; - FieldEvents * v1; + VarsFlags * v1; - v1 = SaveData_GetFieldEvents(fieldSystem->saveData); + v1 = SaveData_GetVarsFlags(fieldSystem->saveData); memset(sub_02050870(v1, 1), 0, (64 / 8)); memset(sub_020508B8(v1, (0 + 0x4000)), 0, 2 * 32); @@ -658,9 +658,9 @@ void FieldSystem_ClearLocalFlags (FieldSystem * fieldSystem) void sub_0203F1FC (FieldSystem * fieldSystem) { - FieldEvents * v0; + VarsFlags * v0; - v0 = SaveData_GetFieldEvents(fieldSystem->saveData); + v0 = SaveData_GetVarsFlags(fieldSystem->saveData); memset(sub_02050870(v0, 2400 + 320), 0, 192 / 8); return; @@ -703,18 +703,18 @@ BOOL sub_0203F28C (u16 param0) BOOL sub_0203F2A0 (FieldSystem * fieldSystem, u16 param1) { - return sub_020507F0(SaveData_GetFieldEvents(fieldSystem->saveData), 1360 + param1); + return sub_020507F0(SaveData_GetVarsFlags(fieldSystem->saveData), 1360 + param1); } void sub_0203F2BC (FieldSystem * fieldSystem, u16 param1) { - sub_0205081C(SaveData_GetFieldEvents(fieldSystem->saveData), 1360 + param1); + sub_0205081C(SaveData_GetVarsFlags(fieldSystem->saveData), 1360 + param1); return; } void sub_0203F2D8 (FieldSystem * fieldSystem, u16 param1) { - sub_02050844(SaveData_GetFieldEvents(fieldSystem->saveData), 1360 + param1); + sub_02050844(SaveData_GetVarsFlags(fieldSystem->saveData), 1360 + param1); return; } diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c index 1f03a3954f..5d8d30a3c9 100644 --- a/src/unk_0203F6C4.c +++ b/src/unk_0203F6C4.c @@ -3139,7 +3139,7 @@ static BOOL ScrCmd_060 (ScriptContext * ctx) MapObject * v3 = sub_02062570(fieldSystem->mapObjMan, 0x30); if (v3) { - if ((sub_0206A984(SaveData_GetFieldEvents(fieldSystem->saveData)) == 1) && (sub_02062D1C(v3) != 0)) { + if ((sub_0206A984(SaveData_GetVarsFlags(fieldSystem->saveData)) == 1) && (sub_02062D1C(v3) != 0)) { sub_02062DDC(v3); ScriptContext_Pause(ctx, sub_020410CC); return 1; @@ -3254,7 +3254,7 @@ static BOOL ScrCmd_2B4 (ScriptContext * ctx) } if (v3) { - if ((sub_0206A984(SaveData_GetFieldEvents(fieldSystem->saveData)) == 1) && (sub_02062D1C(v3) != 0)) { + if ((sub_0206A984(SaveData_GetVarsFlags(fieldSystem->saveData)) == 1) && (sub_02062D1C(v3) != 0)) { inline_020410F4_2((1 << 1)); sub_02062DDC(v3); } @@ -4482,7 +4482,7 @@ static BOOL ScrCmd_0B5 (ScriptContext * ctx) v0 = (*v1); - sub_0206B044(SaveData_GetFieldEvents(ctx->fieldSystem->saveData), v0->species); + sub_0206B044(SaveData_GetVarsFlags(ctx->fieldSystem->saveData), v0->species); Heap_FreeToHeap(*v1); @@ -4880,7 +4880,7 @@ static BOOL ScrCmd_0DE (ScriptContext * ctx) { u16 * v0 = ScriptContext_GetVarPointer(ctx); - *v0 = sub_0206B054(SaveData_GetFieldEvents(ctx->fieldSystem->saveData)); + *v0 = sub_0206B054(SaveData_GetVarsFlags(ctx->fieldSystem->saveData)); return 0; } @@ -5093,7 +5093,7 @@ static BOOL ScrCmd_123 (ScriptContext * ctx) if (v2 == 0) { v4 = sub_02026F58(v0); - *v3 = sub_0205E078(v4, inline_0208BE68(SaveData_GetFieldEvents(ctx->fieldSystem->saveData), 10)); + *v3 = sub_0205E078(v4, inline_0208BE68(SaveData_GetVarsFlags(ctx->fieldSystem->saveData), 10)); } else { v4 = sub_02026F20(v0); *v3 = sub_0205E0E4(v4, TrainerInfo_Gender(v1)); @@ -6165,7 +6165,7 @@ static BOOL ScrCmd_1C5 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - sub_0206B0C4(SaveData_GetFieldEvents(fieldSystem->saveData), 0x8200); + sub_0206B0C4(SaveData_GetVarsFlags(fieldSystem->saveData), 0x8200); return 0; } @@ -6173,7 +6173,7 @@ static BOOL ScrCmd_1CC (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - inline_02044528(SaveData_GetFieldEvents(fieldSystem->saveData)); + inline_02044528(SaveData_GetVarsFlags(fieldSystem->saveData)); fieldSystem->unk_9C = Journal_GetSavedPage(SaveData_GetJournal(fieldSystem->saveData), 1); sub_02053494(fieldSystem); @@ -6452,7 +6452,7 @@ static BOOL ScrCmd_202 (ScriptContext * ctx) u16 * v0; u16 * v1; FieldOverworldState * v2 = SaveData_GetFieldOverworldState(ctx->fieldSystem->saveData); - FieldEvents * v3 = SaveData_GetFieldEvents(ctx->fieldSystem->saveData); + VarsFlags * v3 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); TVBroadcast * v4 = SaveData_TVBroadcast(ctx->fieldSystem->saveData); int v5 = ScriptContext_ReadByte(ctx); @@ -6533,7 +6533,7 @@ static BOOL ScrCmd_211 (ScriptContext * ctx) static BOOL ScrCmd_214 (ScriptContext * ctx) { - FieldEvents * v0 = SaveData_GetFieldEvents(ctx->fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); u16 * v1 = ScriptContext_GetVarPointer(ctx); *v1 = sub_0206B354(v0); @@ -6568,7 +6568,7 @@ static BOOL ScrCmd_219 (ScriptContext * ctx) { u16 v0 = ScriptContext_GetVar(ctx); - sub_0206B270(SaveData_GetFieldEvents(ctx->fieldSystem->saveData), v0); + sub_0206B270(SaveData_GetVarsFlags(ctx->fieldSystem->saveData), v0); return 0; } @@ -6576,7 +6576,7 @@ static BOOL ScrCmd_21A (ScriptContext * ctx) { u16 * v0 = ScriptContext_GetVarPointer(ctx); - *v0 = sub_0206B260(SaveData_GetFieldEvents(ctx->fieldSystem->saveData)); + *v0 = sub_0206B260(SaveData_GetVarsFlags(ctx->fieldSystem->saveData)); return 0; } @@ -7020,7 +7020,7 @@ static BOOL ScrCmd_264 (ScriptContext * ctx) static BOOL ScrCmd_265 (ScriptContext * ctx) { - FieldEvents * v0 = SaveData_GetFieldEvents(ctx->fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); sub_0206AE0C(v0); return 0; @@ -7028,7 +7028,7 @@ static BOOL ScrCmd_265 (ScriptContext * ctx) static BOOL ScrCmd_266 (ScriptContext * ctx) { - FieldEvents * v0 = SaveData_GetFieldEvents(ctx->fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); sub_0206AE1C(v0); return 0; @@ -7149,7 +7149,7 @@ static BOOL ScrCmd_26E (ScriptContext * ctx) static BOOL ScrCmd_26F (ScriptContext * ctx) { - FieldEvents * v0 = SaveData_GetFieldEvents(ctx->fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); sub_0206B364(v0, 0); return 0; @@ -7159,7 +7159,7 @@ static BOOL ScrCmd_270 (ScriptContext * ctx) { u16 v0 = ScriptContext_GetVar(ctx); u8 v1 = ScriptContext_ReadByte(ctx); - FieldEvents * v2 = SaveData_GetFieldEvents(ctx->fieldSystem->saveData); + VarsFlags * v2 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); if (v1) { sub_0206B1B0(v2, v0); @@ -7183,7 +7183,7 @@ static BOOL ScrCmd_273 (ScriptContext * ctx) static BOOL ScrCmd_275 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - FieldEvents * v1 = SaveData_GetFieldEvents(ctx->fieldSystem->saveData); + VarsFlags * v1 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); u16 * v2 = ScriptContext_GetVarPointer(ctx); u32 v3; @@ -7202,7 +7202,7 @@ static BOOL ScrCmd_277 (ScriptContext * ctx) { u16 * v0 = ScriptContext_GetVarPointer(ctx); - *v0 = sub_0206B314(SaveData_GetFieldEvents(ctx->fieldSystem->saveData)); + *v0 = sub_0206B314(SaveData_GetVarsFlags(ctx->fieldSystem->saveData)); return 0; } @@ -7284,7 +7284,7 @@ static BOOL ScrCmd_27F (ScriptContext * ctx) static BOOL ScrCmd_27E (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - FieldEvents * v1 = SaveData_GetFieldEvents(ctx->fieldSystem->saveData); + VarsFlags * v1 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); u16 * v2 = ScriptContext_GetVarPointer(ctx); u16 v3; @@ -7418,7 +7418,7 @@ static BOOL ScrCmd_285 (ScriptContext * ctx) static BOOL ScrCmd_286 (ScriptContext * ctx) { - FieldEvents * v0 = SaveData_GetFieldEvents(ctx->fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); u16 * v1 = ScriptContext_GetVarPointer(ctx); *v1 = sub_0206B3EC(v0); @@ -7427,7 +7427,7 @@ static BOOL ScrCmd_286 (ScriptContext * ctx) static BOOL ScrCmd_287 (ScriptContext * ctx) { - FieldEvents * v0 = SaveData_GetFieldEvents(ctx->fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); u16 * v1 = ScriptContext_GetVarPointer(ctx); *v1 = sub_0206B40C(v0); @@ -7436,7 +7436,7 @@ static BOOL ScrCmd_287 (ScriptContext * ctx) static BOOL ScrCmd_288 (ScriptContext * ctx) { - FieldEvents * v0 = SaveData_GetFieldEvents(ctx->fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); u16 * v1 = ScriptContext_GetVarPointer(ctx); *v1 = sub_0206B42C(v0); @@ -7510,7 +7510,7 @@ static BOOL ScrCmd_28B (ScriptContext * ctx) { u8 v0 = ScriptContext_ReadByte(ctx); u16 * v1 = ScriptContext_GetVarPointer(ctx); - FieldEvents * v2 = SaveData_GetFieldEvents(ctx->fieldSystem->saveData); + VarsFlags * v2 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); GF_ASSERT((v0 <= 4)); @@ -7634,7 +7634,7 @@ static BOOL ScrCmd_29E (ScriptContext * ctx) static BOOL ScrCmd_293 (ScriptContext * ctx) { - FieldEvents * v0 = SaveData_GetFieldEvents(ctx->fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); u16 * v1 = ScriptContext_GetVarPointer(ctx); *v1 = sub_0206B374(v0); diff --git a/src/unk_02046C7C.c b/src/unk_02046C7C.c index bfadc07acd..009da9cada 100644 --- a/src/unk_02046C7C.c +++ b/src/unk_02046C7C.c @@ -109,7 +109,7 @@ BOOL ScrCmd_0FA (ScriptContext * param0) v8.unk_00 = v5; v8.unk_01 = v4; v8.unk_02 = v6; - v8.unk_03 = sub_0206A954(SaveData_GetFieldEvents(param0->fieldSystem->saveData)); + v8.unk_03 = sub_0206A954(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); v8.unk_04 = sub_02027474(SaveData_Pokedex(param0->fieldSystem->saveData)); v8.unk_05 = v7; v8.unk_08 = v1; diff --git a/src/unk_020474B8.c b/src/unk_020474B8.c index cdbbc1e976..5efaa3e1cf 100644 --- a/src/unk_020474B8.c +++ b/src/unk_020474B8.c @@ -298,7 +298,7 @@ BOOL ScrCmd_0DB (ScriptContext * param0) { StringTemplate ** v0 = sub_0203F098(param0->fieldSystem, 15); u8 v1 = ScriptContext_ReadByte(param0); - u16 v2 = sub_0206B054(SaveData_GetFieldEvents(param0->fieldSystem->saveData)); + u16 v2 = sub_0206B054(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); Strbuf* v3 = sub_02047998(v2, 4); StringTemplate_SetStrbuf(*v0, v1, v3, 0, 1, GAME_LANGUAGE); @@ -311,7 +311,7 @@ BOOL ScrCmd_0DC (ScriptContext * param0) { StringTemplate ** v0 = sub_0203F098(param0->fieldSystem, 15); u8 v1 = ScriptContext_ReadByte(param0); - u16 v2 = sub_0206B064(SaveData_GetFieldEvents(param0->fieldSystem->saveData)); + u16 v2 = sub_0206B064(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); Strbuf* v3 = sub_02047998(v2, 4); StringTemplate_SetStrbuf(*v0, v1, v3, 0, 1, GAME_LANGUAGE); @@ -324,7 +324,7 @@ BOOL ScrCmd_0DD (ScriptContext * param0) { StringTemplate ** v0 = sub_0203F098(param0->fieldSystem, 15); u8 v1 = ScriptContext_ReadByte(param0); - u16 v2 = sub_0206B08C(SaveData_GetFieldEvents(param0->fieldSystem->saveData)); + u16 v2 = sub_0206B08C(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); Strbuf* v3 = sub_02047998(v2, 4); StringTemplate_SetStrbuf(*v0, v1, v3, 0, 1, GAME_LANGUAGE); @@ -558,7 +558,7 @@ BOOL ScrCmd_342 (ScriptContext * param0) { StringTemplate ** v0 = sub_0203F098(param0->fieldSystem, 15); u8 v1 = ScriptContext_ReadByte(param0); - u16 v2 = sub_0206B08C(SaveData_GetFieldEvents(param0->fieldSystem->saveData)); + u16 v2 = sub_0206B08C(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); StringTemplate_SetSpeciesNameWithArticleByID(*v0, v1, v2); return 0; diff --git a/src/unk_020480A8.c b/src/unk_020480A8.c index e2167a242a..709362ee74 100644 --- a/src/unk_020480A8.c +++ b/src/unk_020480A8.c @@ -22,7 +22,7 @@ static u8 sub_02048268(u16 param0, u16 param1); BOOL ScrCmd_24E (ScriptContext * param0) { - FieldEvents * v0 = SaveData_GetFieldEvents(param0->fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); u16 * v1 = ScriptContext_GetVarPointer(param0); u32 v2; @@ -107,7 +107,7 @@ BOOL ScrCmd_24F (ScriptContext * param0) BOOL ScrCmd_250 (ScriptContext * param0) { - FieldEvents * v0 = SaveData_GetFieldEvents(param0->fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); sub_0206B2C8(v0); return 0; diff --git a/src/unk_02048614.c b/src/unk_02048614.c index f5098a5783..cd9e42ab43 100644 --- a/src/unk_02048614.c +++ b/src/unk_02048614.c @@ -152,8 +152,8 @@ BOOL ScrCmd_0E5 (ScriptContext * param0) v6 = 0; - if (sub_0206A984(SaveData_GetFieldEvents(param0->fieldSystem->saveData)) == 1) { - v6 = sub_0206B034(SaveData_GetFieldEvents(fieldSystem->saveData)); + if (sub_0206A984(SaveData_GetVarsFlags(param0->fieldSystem->saveData)) == 1) { + v6 = sub_0206B034(SaveData_GetVarsFlags(fieldSystem->saveData)); } sub_020515CC(param0->taskManager, v4, v5, v6, 11, v3); diff --git a/src/unk_02049D08.c b/src/unk_02049D08.c index 4f03cd3773..ffff1fcb54 100644 --- a/src/unk_02049D08.c +++ b/src/unk_02049D08.c @@ -229,14 +229,14 @@ void sub_02049FA8 (FieldSystem * fieldSystem) Location * v0 = sub_0203A730(SaveData_GetFieldOverworldState(fieldSystem->saveData)); Location_Set(v0, fieldSystem->location->mapId, -1, Player_GetXPos(fieldSystem->playerAvatar), Player_GetZPos(fieldSystem->playerAvatar), 0); - sub_0206AD9C(SaveData_GetFieldEvents(fieldSystem->saveData)); + sub_0206AD9C(SaveData_GetVarsFlags(fieldSystem->saveData)); return; } void sub_02049FE8 (FieldSystem * fieldSystem) { - FieldEvents_ResetCommClub(SaveData_GetFieldEvents(fieldSystem->saveData)); + FieldEvents_ResetCommClub(SaveData_GetVarsFlags(fieldSystem->saveData)); } u16 sub_02049FF8 (SaveData * param0, u16 param1) @@ -380,7 +380,7 @@ UnkStruct_0204AFC4 * sub_0204A124 (SaveData * param0, u16 param1, u16 param2) v5 = sub_0202CD88(param0); if (v3->unk_0F == 6) { - v2 = sub_0206B6FC(SaveData_GetFieldEvents(param0)); + v2 = sub_0206B6FC(SaveData_GetVarsFlags(param0)); } else { v2 = sub_0202D414(v3->unk_74, 8 + v3->unk_0F, 0); } diff --git a/src/unk_0204B830.c b/src/unk_0204B830.c index dd7c17e97b..0c96b74d59 100644 --- a/src/unk_0204B830.c +++ b/src/unk_0204B830.c @@ -186,7 +186,7 @@ static void sub_0204BAAC (FieldSystem * fieldSystem, void * param1) { UnkUnion_0204C4D0 * v0 = sub_0204B844(fieldSystem); TrainerInfo * v1 = SaveData_GetTrainerInfo(fieldSystem->saveData); - FieldEvents * v2 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v2 = SaveData_GetVarsFlags(fieldSystem->saveData); Party * v3; Pokemon * v4; BOOL v5; @@ -557,7 +557,7 @@ static void sub_0204C15C (FieldSystem * fieldSystem, void * param1) { UnkStruct_0207D3C0 * v0 = sub_0207D990(fieldSystem->saveData); UnkUnion_0204C4D0 * v1 = sub_0204B844(fieldSystem); - FieldEvents * v2 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v2 = SaveData_GetVarsFlags(fieldSystem->saveData); u16 v3; u16 v4 = 454; @@ -601,7 +601,7 @@ static void sub_0204C220 (FieldSystem * fieldSystem, void * param1) { UnkStruct_0207D3C0 * v0 = sub_0207D990(fieldSystem->saveData); UnkUnion_0204C4D0 * v1 = sub_0204B844(fieldSystem); - FieldEvents * v2 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v2 = SaveData_GetVarsFlags(fieldSystem->saveData); u16 v3; u16 v4 = 452; @@ -649,7 +649,7 @@ static void sub_0204C2F4 (FieldSystem * fieldSystem, void * param1) { UnkStruct_0207D3C0 * v0 = sub_0207D990(fieldSystem->saveData); UnkUnion_0204C4D0 * v1 = sub_0204B844(fieldSystem); - FieldEvents * v2 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v2 = SaveData_GetVarsFlags(fieldSystem->saveData); u16 v3; u16 v4 = 467; @@ -693,7 +693,7 @@ static void sub_0204C3B8 (FieldSystem * fieldSystem, void * param1) { UnkStruct_0207D3C0 * v0 = sub_0207D990(fieldSystem->saveData); UnkUnion_0204C4D0 * v1 = sub_0204B844(fieldSystem); - FieldEvents * v2 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v2 = SaveData_GetVarsFlags(fieldSystem->saveData); u16 v3; u16 v4 = 455; diff --git a/src/unk_0204C500.c b/src/unk_0204C500.c index c3b87a2c49..752378ca88 100644 --- a/src/unk_0204C500.c +++ b/src/unk_0204C500.c @@ -27,7 +27,7 @@ BOOL ScrCmd_253 (ScriptContext * param0) { - FieldEvents * v0 = SaveData_GetFieldEvents(param0->fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); u16 v1 = ScriptContext_GetVar(param0); if (v1 == 0) { diff --git a/src/unk_0204CDDC.c b/src/unk_0204CDDC.c index cc8d1f474b..38f4842312 100644 --- a/src/unk_0204CDDC.c +++ b/src/unk_0204CDDC.c @@ -18,7 +18,7 @@ BOOL ScrCmd_2E1(ScriptContext * param0); BOOL ScrCmd_215 (ScriptContext * param0) { - sub_0206B218(SaveData_GetFieldEvents(param0->fieldSystem->saveData)); + sub_0206B218(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); return 0; } @@ -26,7 +26,7 @@ BOOL ScrCmd_216 (ScriptContext * param0) { u16 * v0 = ScriptContext_GetVarPointer(param0); - *v0 = sub_0206B228(SaveData_GetFieldEvents(param0->fieldSystem->saveData)); + *v0 = sub_0206B228(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); return 0; } diff --git a/src/unk_0204E3CC.c b/src/unk_0204E3CC.c index 203a861f38..34e206e236 100644 --- a/src/unk_0204E3CC.c +++ b/src/unk_0204E3CC.c @@ -88,7 +88,7 @@ BOOL ScrCmd_15E (ScriptContext * param0) { u16 * v0 = ScriptContext_GetVarPointer(param0); - *v0 = sub_0206A938(SaveData_GetFieldEvents(param0->fieldSystem->saveData)); + *v0 = sub_0206A938(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); return 0; } @@ -120,7 +120,7 @@ BOOL ScrCmd_15D (ScriptContext * param0) BOOL ScrCmd_15F (ScriptContext * param0) { - sub_0206A92C(SaveData_GetFieldEvents(param0->fieldSystem->saveData)); + sub_0206A92C(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); return 0; } @@ -128,19 +128,19 @@ BOOL ScrCmd_160 (ScriptContext * param0) { u16 * v0 = ScriptContext_GetVarPointer(param0); - *v0 = sub_0206A984(SaveData_GetFieldEvents(param0->fieldSystem->saveData)); + *v0 = sub_0206A984(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); return 0; } BOOL ScrCmd_161 (ScriptContext * param0) { - sub_0206A964(SaveData_GetFieldEvents(param0->fieldSystem->saveData)); + sub_0206A964(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); return 0; } BOOL ScrCmd_162 (ScriptContext * param0) { - sub_0206A974(SaveData_GetFieldEvents(param0->fieldSystem->saveData)); + sub_0206A974(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); return 0; } @@ -148,19 +148,19 @@ BOOL ScrCmd_163 (ScriptContext * param0) { u16 * v0 = ScriptContext_GetVarPointer(param0); - *v0 = sub_0206A9B4(SaveData_GetFieldEvents(param0->fieldSystem->saveData)); + *v0 = sub_0206A9B4(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); return 0; } BOOL ScrCmd_164 (ScriptContext * param0) { - sub_0206A994(SaveData_GetFieldEvents(param0->fieldSystem->saveData)); + sub_0206A994(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); return 0; } BOOL ScrCmd_165 (ScriptContext * param0) { - sub_0206A9A4(SaveData_GetFieldEvents(param0->fieldSystem->saveData)); + sub_0206A9A4(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); return 0; } @@ -168,13 +168,13 @@ BOOL ScrCmd_166 (ScriptContext * param0) { u16 * v0 = ScriptContext_GetVarPointer(param0); - *v0 = sub_0206A954(SaveData_GetFieldEvents(param0->fieldSystem->saveData)); + *v0 = sub_0206A954(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); return 0; } BOOL ScrCmd_167 (ScriptContext * param0) { - sub_0206A944(SaveData_GetFieldEvents(param0->fieldSystem->saveData)); + sub_0206A944(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); return 0; } @@ -182,7 +182,7 @@ BOOL ScrCmd_1CF (ScriptContext * param0) { u8 v0; u16 * v1; - FieldEvents * v2 = SaveData_GetFieldEvents(param0->fieldSystem->saveData); + VarsFlags * v2 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); v0 = ScriptContext_ReadByte(param0); @@ -208,7 +208,7 @@ BOOL ScrCmd_1D0 (ScriptContext * param0) { u8 v0; u16 * v1; - FieldEvents * v2 = SaveData_GetFieldEvents(param0->fieldSystem->saveData); + VarsFlags * v2 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); v0 = ScriptContext_ReadByte(param0); @@ -234,7 +234,7 @@ BOOL ScrCmd_1D1 (ScriptContext * param0) { u8 v0; u16 * v1; - FieldEvents * v2 = SaveData_GetFieldEvents(param0->fieldSystem->saveData); + VarsFlags * v2 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); v0 = ScriptContext_ReadByte(param0); diff --git a/src/unk_02050568.c b/src/unk_02050568.c index b871bff559..82a6f0de86 100644 --- a/src/unk_02050568.c +++ b/src/unk_02050568.c @@ -52,7 +52,7 @@ static BOOL sub_020505A0 (TaskManager * taskMan) { FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); UnkStruct_02050568 * v1 = TaskManager_Environment(taskMan); - FieldEvents * v2 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v2 = SaveData_GetVarsFlags(fieldSystem->saveData); switch (v1->unk_08) { case 0: diff --git a/src/unk_020507CC.c b/src/unk_020507CC.c index df6e231d9c..1e82fde4f9 100644 --- a/src/unk_020507CC.c +++ b/src/unk_020507CC.c @@ -9,29 +9,29 @@ typedef struct UnkStruct_020507E4_t { u16 unk_00[288]; u8 unk_240[364]; -} FieldEvents; +} VarsFlags; static u8 Unk_021C07F4[8] = {}; -int FieldEvents_SaveSize (void) +int VarsFlags_Size (void) { - return sizeof(FieldEvents); + return sizeof(VarsFlags); } -void FieldEvents_Init (FieldEvents * param0) +void VarsFlags_Init (VarsFlags * param0) { - memset(param0, 0, sizeof(FieldEvents)); + memset(param0, 0, sizeof(VarsFlags)); } -FieldEvents * SaveData_GetFieldEvents (SaveData * param0) +VarsFlags * SaveData_GetVarsFlags (SaveData * param0) { - FieldEvents * v0; + VarsFlags * v0; - v0 = (FieldEvents *)SaveData_SaveTable(param0, 4); + v0 = (VarsFlags *)SaveData_SaveTable(param0, 4); return v0; } -BOOL sub_020507F0 (FieldEvents * param0, u16 param1) +BOOL sub_020507F0 (VarsFlags * param0, u16 param1) { u8 * v0 = sub_02050870(param0, param1); @@ -44,7 +44,7 @@ BOOL sub_020507F0 (FieldEvents * param0, u16 param1) return 0; } -void sub_0205081C (FieldEvents * param0, u16 param1) +void sub_0205081C (VarsFlags * param0, u16 param1) { u8 * v0 = sub_02050870(param0, param1); @@ -57,7 +57,7 @@ void sub_0205081C (FieldEvents * param0, u16 param1) return; } -void sub_02050844 (FieldEvents * param0, u16 param1) +void sub_02050844 (VarsFlags * param0, u16 param1) { u8 * v0 = sub_02050870(param0, param1); @@ -70,7 +70,7 @@ void sub_02050844 (FieldEvents * param0, u16 param1) return; } -u8 * sub_02050870 (FieldEvents * param0, u16 param1) +u8 * sub_02050870 (VarsFlags * param0, u16 param1) { if (param1 == 0) { return NULL; @@ -89,7 +89,7 @@ u8 * sub_02050870 (FieldEvents * param0, u16 param1) } } -u16 * sub_020508B8 (FieldEvents * param0, u16 param1) +u16 * sub_020508B8 (VarsFlags * param0, u16 param1) { if ((param1 - 0x4000) >= 288) { GF_ASSERT(FALSE); diff --git a/src/unk_02050A74.c b/src/unk_02050A74.c index e3bd3aa29f..fc1356d775 100644 --- a/src/unk_02050A74.c +++ b/src/unk_02050A74.c @@ -186,13 +186,13 @@ static BOOL sub_02050B30 (TaskManager * taskMan) return 1; } - if (sub_0206A984(SaveData_GetFieldEvents(fieldSystem->saveData))) { + if (sub_0206A984(SaveData_GetVarsFlags(fieldSystem->saveData))) { HealAllPokemonInParty(Party_GetFromSavedata(fieldSystem->saveData)); } sub_020518B0(fieldSystem, v1->unk_10); sub_02051988(fieldSystem, v1->unk_10); - sub_0206B48C(SaveData_GetFieldEvents(fieldSystem->saveData), v1->unk_10->unk_18C); + sub_0206B48C(SaveData_GetVarsFlags(fieldSystem->saveData), v1->unk_10->unk_18C); sub_02055868(taskMan); (*v2)++; break; @@ -342,7 +342,7 @@ static void sub_02050DFC (UnkStruct_02050DD4 * param0) void sub_02050E10 (FieldSystem * fieldSystem, BattleParams * param1) { - if (sub_0206AE5C(SaveData_GetFieldEvents(fieldSystem->saveData))) { + if (sub_0206AE5C(SaveData_GetVarsFlags(fieldSystem->saveData))) { UnkStruct_02050ACC * v0; v0 = sub_02050ACC(param1, EncEffects_CutInEffect(param1), EncEffects_BGM(param1), NULL); @@ -357,7 +357,7 @@ void sub_02050E10 (FieldSystem * fieldSystem, BattleParams * param1) void sub_02050E78 (FieldSystem * fieldSystem, TaskManager * param1, BattleParams * param2) { - if (sub_0206AE5C(SaveData_GetFieldEvents(fieldSystem->saveData))) { + if (sub_0206AE5C(SaveData_GetVarsFlags(fieldSystem->saveData))) { UnkStruct_02050ACC * v0; v0 = sub_02050ACC(param2, EncEffects_CutInEffect(param2), EncEffects_BGM(param2), NULL); @@ -404,7 +404,7 @@ static BOOL sub_02050EE0 (TaskManager * taskMan) return 0; } - if (sub_0206A984(SaveData_GetFieldEvents(fieldSystem->saveData))) { + if (sub_0206A984(SaveData_GetVarsFlags(fieldSystem->saveData))) { HealAllPokemonInParty(Party_GetFromSavedata(fieldSystem->saveData)); } diff --git a/src/unk_02051D8C.c b/src/unk_02051D8C.c index b2e40ba8b9..eff4d01c5d 100644 --- a/src/unk_02051D8C.c +++ b/src/unk_02051D8C.c @@ -179,7 +179,7 @@ BattleParams * sub_02051F4C (int param0, const FieldSystem * fieldSystem) sub_0207D570(v4->unk_E0, 4, 20, param0); v5 = Pokemon_New(param0); - Pokemon_InitWith(v5, sub_0206B08C(SaveData_GetFieldEvents(fieldSystem->saveData)), 5, 32, 0, 0, 2, 0); + Pokemon_InitWith(v5, sub_0206B08C(SaveData_GetVarsFlags(fieldSystem->saveData)), 5, 32, 0, 0, 2, 0); Party_AddPokemon(v4->parties[0], v5); Pokemon_InitWith(v5, 399, 2, 32, 0, 0, 2, 0); Party_AddPokemon(v4->parties[1], v5); @@ -283,7 +283,7 @@ void sub_020521B8 (BattleParams * param0, const FieldSystem * fieldSystem, SaveD param0->unk_130 = MapHeader_GetMapLabelTextID(param3); param0->unk_13C = MapHeader_GetMapEvolutionMethod(param3); param0->unk_140 = PokemonSummary_ShowContestData(param2); - param0->unk_144 = sub_0206ADFC(SaveData_GetFieldEvents(param2)); + param0->unk_144 = sub_0206ADFC(SaveData_GetVarsFlags(param2)); param0->unk_14C = FieldOverworldState_GetWeather(v6); param0->unk_E4 = param5; param0->unk_190 = param6; diff --git a/src/unk_02052C6C.c b/src/unk_02052C6C.c index 4279e9be9f..7c8d38da57 100644 --- a/src/unk_02052C6C.c +++ b/src/unk_02052C6C.c @@ -93,7 +93,7 @@ static void sub_02052C6C (FieldSystem * fieldSystem, BOOL param1) static BOOL sub_02052CBC (TaskManager * param0) { Location * v0; - FieldEvents * v1; + VarsFlags * v1; FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); UnkStruct_0205300C * v3 = TaskManager_Environment(param0); int * v4 = FieldTask_GetState(param0); @@ -182,7 +182,7 @@ void sub_02052E58 (TaskManager * param0) { FieldSystem * fieldSystem; Location * v1, * v2; - FieldEvents * v3; + VarsFlags * v3; TrainerInfo * v4; UnkStruct_0205300C * v5; UnkStruct_0202CD88 * v6; @@ -190,7 +190,7 @@ void sub_02052E58 (TaskManager * param0) fieldSystem = TaskManager_FieldSystem(param0); v5 = Heap_AllocFromHeap(32, sizeof(UnkStruct_0205300C)); - v3 = SaveData_GetFieldEvents(fieldSystem->saveData); + v3 = SaveData_GetVarsFlags(fieldSystem->saveData); v4 = SaveData_GetTrainerInfo(fieldSystem->saveData); v1 = sub_0203A730(SaveData_GetFieldOverworldState(fieldSystem->saveData)); v2 = sub_0203A72C(SaveData_GetFieldOverworldState(fieldSystem->saveData)); diff --git a/src/unk_020553DC.c b/src/unk_020553DC.c index 36ce72473f..6f3477303b 100644 --- a/src/unk_020553DC.c +++ b/src/unk_020553DC.c @@ -191,7 +191,7 @@ u16 sub_020554A4 (FieldSystem * fieldSystem, int param1) v0 = MapHeader_GetNightMusicID(param1); } - v1 = sub_0206AB68(SaveData_GetFieldEvents(fieldSystem->saveData), param1); + v1 = sub_0206AB68(SaveData_GetVarsFlags(fieldSystem->saveData), param1); if (v1 != 0) { v0 = v1; diff --git a/src/unk_020559DC.c b/src/unk_020559DC.c index 94d328a956..ef4c9d3f2a 100644 --- a/src/unk_020559DC.c +++ b/src/unk_020559DC.c @@ -105,7 +105,7 @@ static void sub_02055AC0 (FieldSystem * fieldSystem, s32 param1) } { - FieldEvents * v1 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v1 = SaveData_GetVarsFlags(fieldSystem->saveData); u16 v2 = sub_0206B260(v1); if (v2 > param1) { diff --git a/src/unk_02056B30.c b/src/unk_02056B30.c index 1f759402a3..172e6baf1c 100644 --- a/src/unk_02056B30.c +++ b/src/unk_02056B30.c @@ -211,7 +211,7 @@ static BOOL sub_02056CFC (TaskManager * taskMan) switch (v1->unk_00) { case 0: v1->unk_04 = 0; - Sound_TryFadeInBgm(fieldSystem, v2->mapId); + Sound_TryFadeInBGM(fieldSystem, v2->mapId); FieldTask_Start(taskMan, Unk_020EC560[v1->unk_20], v1); (v1->unk_00)++; break; diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c index b02621fd1e..6cdb553f32 100644 --- a/src/unk_020683F4.c +++ b/src/unk_020683F4.c @@ -218,7 +218,7 @@ void sub_0206842C (FieldSystem * fieldSystem, UnkStruct_020684D0 * param1) param1->fieldSystem = fieldSystem; param1->unk_00 = fieldSystem->location->mapId; - param1->unk_04 = sub_0206A984(SaveData_GetFieldEvents(fieldSystem->saveData)); + param1->unk_04 = sub_0206A984(SaveData_GetVarsFlags(fieldSystem->saveData)); param1->unk_08 = PlayerAvatar_GetPlayerState(fieldSystem->playerAvatar); v0 = Player_GetXPos(fieldSystem->playerAvatar); @@ -254,7 +254,7 @@ static void sub_020684D0 (FieldSystem * fieldSystem, UnkStruct_020684D0 * param1 { param1->fieldSystem = fieldSystem; param1->unk_00 = fieldSystem->location->mapId; - param1->unk_04 = sub_0206A984(SaveData_GetFieldEvents(fieldSystem->saveData)); + param1->unk_04 = sub_0206A984(SaveData_GetVarsFlags(fieldSystem->saveData)); param1->unk_08 = PlayerAvatar_GetPlayerState(fieldSystem->playerAvatar); param1->unk_0E = sub_02061760(fieldSystem->playerAvatar); @@ -424,7 +424,7 @@ static u32 sub_0206877C (const UnkStruct_020684D0 * param0) return -1; } - if ((sub_0206AE5C(SaveData_GetFieldEvents(param0->fieldSystem->saveData)) == 1) || (sub_0206AE8C(SaveData_GetFieldEvents(param0->fieldSystem->saveData)) == 1)) { + if ((sub_0206AE5C(SaveData_GetVarsFlags(param0->fieldSystem->saveData)) == 1) || (sub_0206AE8C(SaveData_GetVarsFlags(param0->fieldSystem->saveData)) == 1)) { return -1; } @@ -522,7 +522,7 @@ static BOOL sub_02068884 (TaskManager * param0) static u32 sub_02068948 (const UnkStruct_020684D0 * param0) { - FieldEvents * v0 = SaveData_GetFieldEvents(param0->fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); if (param0->unk_04 == 1) { return 2; @@ -1063,7 +1063,7 @@ static BOOL sub_02069120 (UnkStruct_02068870 * param0) static u32 sub_02069130 (const UnkStruct_020684D0 * param0) { - FieldEvents * v0 = SaveData_GetFieldEvents(param0->fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); if (sub_0206A954(v0) == 0) { return -1; @@ -1149,7 +1149,7 @@ BOOL sub_02069238 (FieldSystem * fieldSystem) return 0; } - if (sub_0206AE8C(SaveData_GetFieldEvents(fieldSystem->saveData)) == 1) { + if (sub_0206AE8C(SaveData_GetVarsFlags(fieldSystem->saveData)) == 1) { return 0; } diff --git a/src/unk_0206A8DC.c b/src/unk_0206A8DC.c index 22fc42d91e..3552986192 100644 --- a/src/unk_0206A8DC.c +++ b/src/unk_0206A8DC.c @@ -7,29 +7,29 @@ #include "unk_020507CC.h" #include "unk_0206A8DC.h" -static void sub_0206A8DC(FieldEvents * param0, u16 param1); -static void sub_0206A8E4(FieldEvents * param0, u16 param1); -static BOOL sub_0206A8EC(FieldEvents * param0, u16 param1); -static BOOL sub_0206A8F4(FieldEvents * param0, int param1, u32 param2); +static void sub_0206A8DC(VarsFlags * param0, u16 param1); +static void sub_0206A8E4(VarsFlags * param0, u16 param1); +static BOOL sub_0206A8EC(VarsFlags * param0, u16 param1); +static BOOL sub_0206A8F4(VarsFlags * param0, int param1, u32 param2); -static void sub_0206A8DC (FieldEvents * param0, u16 param1) +static void sub_0206A8DC (VarsFlags * param0, u16 param1) { sub_0205081C(param0, param1); return; } -static void sub_0206A8E4 (FieldEvents * param0, u16 param1) +static void sub_0206A8E4 (VarsFlags * param0, u16 param1) { sub_02050844(param0, param1); return; } -static BOOL sub_0206A8EC (FieldEvents * param0, u16 param1) +static BOOL sub_0206A8EC (VarsFlags * param0, u16 param1) { return sub_020507F0(param0, param1); } -static BOOL sub_0206A8F4 (FieldEvents * param0, int param1, u32 param2) +static BOOL sub_0206A8F4 (VarsFlags * param0, int param1, u32 param2) { switch (param1) { case 1: @@ -47,116 +47,116 @@ static BOOL sub_0206A8F4 (FieldEvents * param0, int param1, u32 param2) return 0; } -void sub_0206A92C (FieldEvents * param0) +void sub_0206A92C (VarsFlags * param0) { sub_0206A8DC(param0, (2400 + 0)); return; } -BOOL sub_0206A938 (FieldEvents * param0) +BOOL sub_0206A938 (VarsFlags * param0) { return sub_0206A8EC(param0, (2400 + 0)); } -void sub_0206A944 (FieldEvents * param0) +void sub_0206A944 (VarsFlags * param0) { sub_0206A8DC(param0, (2400 + 4)); return; } -BOOL sub_0206A954 (FieldEvents * param0) +BOOL sub_0206A954 (VarsFlags * param0) { return sub_0206A8EC(param0, (2400 + 4)); } -void sub_0206A964 (FieldEvents * param0) +void sub_0206A964 (VarsFlags * param0) { sub_0206A8DC(param0, (2400 + 1)); return; } -void sub_0206A974 (FieldEvents * param0) +void sub_0206A974 (VarsFlags * param0) { sub_0206A8E4(param0, (2400 + 1)); return; } -BOOL sub_0206A984 (FieldEvents * param0) +BOOL sub_0206A984 (VarsFlags * param0) { return sub_0206A8EC(param0, (2400 + 1)); } -void sub_0206A994 (FieldEvents * param0) +void sub_0206A994 (VarsFlags * param0) { sub_0206A8DC(param0, (2400 + 5)); return; } -void sub_0206A9A4 (FieldEvents * param0) +void sub_0206A9A4 (VarsFlags * param0) { sub_0206A8E4(param0, (2400 + 5)); return; } -BOOL sub_0206A9B4 (FieldEvents * param0) +BOOL sub_0206A9B4 (VarsFlags * param0) { return sub_0206A8EC(param0, (2400 + 5)); } -void sub_0206A9C4 (FieldEvents * param0) +void sub_0206A9C4 (VarsFlags * param0) { sub_0206A8DC(param0, (2400 + 13)); return; } -void sub_0206A9D4 (FieldEvents * param0) +void sub_0206A9D4 (VarsFlags * param0) { sub_0206A8E4(param0, (2400 + 13)); return; } -BOOL sub_0206A9E4 (FieldEvents * param0) +BOOL sub_0206A9E4 (VarsFlags * param0) { return sub_0206A8EC(param0, (2400 + 13)); } -void sub_0206A9F4 (FieldEvents * param0) +void sub_0206A9F4 (VarsFlags * param0) { sub_0206A8DC(param0, (2400 + 14)); return; } -void sub_0206AA04 (FieldEvents * param0) +void sub_0206AA04 (VarsFlags * param0) { sub_0206A8DC(param0, (2400 + 15)); return; } -void sub_0206AA14 (FieldEvents * param0) +void sub_0206AA14 (VarsFlags * param0) { sub_0206A8DC(param0, (2400 + 16)); return; } -void sub_0206AA20 (FieldEvents * param0) +void sub_0206AA20 (VarsFlags * param0) { sub_0206A8DC(param0, (2400 + 17)); return; } -void sub_0206AA30 (FieldEvents * param0) +void sub_0206AA30 (VarsFlags * param0) { sub_0206A8DC(param0, (2400 + 18)); return; } -void sub_0206AA40 (FieldEvents * param0) +void sub_0206AA40 (VarsFlags * param0) { sub_0206A8DC(param0, (2400 + 19)); return; } -void sub_0206AA50 (FieldEvents * param0, int param1) +void sub_0206AA50 (VarsFlags * param0, int param1) { switch (param1) { case 0: @@ -179,7 +179,7 @@ void sub_0206AA50 (FieldEvents * param0, int param1) return; } -BOOL sub_0206AAA8 (FieldEvents * param0, int param1) +BOOL sub_0206AAA8 (VarsFlags * param0, int param1) { int v0; @@ -204,7 +204,7 @@ BOOL sub_0206AAA8 (FieldEvents * param0, int param1) return v0; } -BOOL sub_0206AB00 (FieldEvents * param0, int param1) +BOOL sub_0206AB00 (VarsFlags * param0, int param1) { int v0 = 0; @@ -229,7 +229,7 @@ BOOL sub_0206AB00 (FieldEvents * param0, int param1) return v0; } -u16 sub_0206AB68 (FieldEvents * param0, int param1) +u16 sub_0206AB68 (VarsFlags * param0, int param1) { u16 v0 = 0; @@ -336,178 +336,178 @@ u16 sub_0206AB68 (FieldEvents * param0, int param1) return v0; } -void sub_0206AD9C (FieldEvents * param0) +void sub_0206AD9C (VarsFlags * param0) { sub_0206A8DC(param0, (2400 + 6)); return; } -void FieldEvents_ResetCommClub (FieldEvents * param0) +void FieldEvents_ResetCommClub (VarsFlags * param0) { sub_0206A8E4(param0, (2400 + 6)); return; } -BOOL FieldEvents_CheckCommClub (FieldEvents * param0) +BOOL FieldEvents_CheckCommClub (VarsFlags * param0) { return sub_0206A8EC(param0, (2400 + 6)); } -BOOL EventFlag_VisitedContestHall (FieldEvents * param0) +BOOL EventFlag_VisitedContestHall (VarsFlags * param0) { return sub_0206A8EC(param0, (2400 + 24)); } -BOOL sub_0206ADDC (FieldEvents * param0) +BOOL sub_0206ADDC (VarsFlags * param0) { return sub_0206A8EC(param0, (2400 + 50)); } -BOOL sub_0206ADEC (FieldEvents * param0) +BOOL sub_0206ADEC (VarsFlags * param0) { return sub_0206A8EC(param0, (2400 + 29)); } -BOOL sub_0206ADFC (FieldEvents * param0) +BOOL sub_0206ADFC (VarsFlags * param0) { return sub_0206A8EC(param0, (2400 + 30)); } -void sub_0206AE0C (FieldEvents * param0) +void sub_0206AE0C (VarsFlags * param0) { sub_0206A8DC(param0, (2400 + 28)); } -void sub_0206AE1C (FieldEvents * param0) +void sub_0206AE1C (VarsFlags * param0) { sub_0206A8E4(param0, (2400 + 28)); } -BOOL sub_0206AE2C (FieldEvents * param0) +BOOL sub_0206AE2C (VarsFlags * param0) { return sub_0206A8EC(param0, (2400 + 28)); } -void sub_0206AE3C (FieldEvents * param0) +void sub_0206AE3C (VarsFlags * param0) { sub_0206A8DC(param0, (2400 + 7)); } -void sub_0206AE4C (FieldEvents * param0) +void sub_0206AE4C (VarsFlags * param0) { sub_0206A8E4(param0, (2400 + 7)); } -BOOL sub_0206AE5C (FieldEvents * param0) +BOOL sub_0206AE5C (VarsFlags * param0) { return sub_0206A8EC(param0, (2400 + 7)); } -void sub_0206AE6C (FieldEvents * param0) +void sub_0206AE6C (VarsFlags * param0) { sub_0206A8DC(param0, (2400 + 25)); } -void sub_0206AE7C (FieldEvents * param0) +void sub_0206AE7C (VarsFlags * param0) { sub_0206A8E4(param0, (2400 + 25)); } -BOOL sub_0206AE8C (FieldEvents * param0) +BOOL sub_0206AE8C (VarsFlags * param0) { return sub_0206A8EC(param0, (2400 + 25)); } -void sub_0206AE9C (FieldEvents * param0) +void sub_0206AE9C (VarsFlags * param0) { sub_0206A8E4(param0, (2400 + 52)); } -BOOL sub_0206AEAC (FieldEvents * param0, int param1) +BOOL sub_0206AEAC (VarsFlags * param0, int param1) { return sub_0206A8F4(param0, param1, (2400 + 2)); } -void sub_0206AEBC (FieldEvents * param0) +void sub_0206AEBC (VarsFlags * param0) { sub_0206A8DC(param0, (2400 + 26)); } -void sub_0206AECC (FieldEvents * param0) +void sub_0206AECC (VarsFlags * param0) { sub_0206A8E4(param0, (2400 + 26)); } -BOOL FieldEvents_CheckFlash (FieldEvents * param0) +BOOL FieldEvents_CheckFlash (VarsFlags * param0) { return sub_0206A8EC(param0, (2400 + 26)); } -void sub_0206AEEC (FieldEvents * param0) +void sub_0206AEEC (VarsFlags * param0) { sub_0206A8DC(param0, (2400 + 27)); } -void sub_0206AEFC (FieldEvents * param0) +void sub_0206AEFC (VarsFlags * param0) { sub_0206A8E4(param0, (2400 + 27)); } -BOOL FieldEvents_CheckDefog (FieldEvents * param0) +BOOL FieldEvents_CheckDefog (VarsFlags * param0) { return sub_0206A8EC(param0, (2400 + 27)); } -BOOL sub_0206AF1C (FieldEvents * param0, int param1) +BOOL sub_0206AF1C (VarsFlags * param0, int param1) { return sub_0206A8F4(param0, param1, (2400 + 54)); } -BOOL sub_0206AF2C (FieldEvents * param0, int param1) +BOOL sub_0206AF2C (VarsFlags * param0, int param1) { return sub_0206A8F4(param0, param1, (2400 + 3)); } -BOOL sub_0206AF3C (FieldEvents * param0, int param1, u32 param2) +BOOL sub_0206AF3C (VarsFlags * param0, int param1, u32 param2) { GF_ASSERT(param2 < 69); return sub_0206A8F4(param0, param1, (2400 + 80) + param2); } -void sub_0206AF5C (FieldEvents * param0) +void sub_0206AF5C (VarsFlags * param0) { sub_0206A8DC(param0, (2400 + 44)); } -BOOL sub_0206AF6C (FieldEvents * param0, int param1, int param2) +BOOL sub_0206AF6C (VarsFlags * param0, int param1, int param2) { GF_ASSERT(param2 < 20); return sub_0206A8F4(param0, param1, (2400 + 55) + param2); } -void sub_0206AF90 (FieldEvents * param0) +void sub_0206AF90 (VarsFlags * param0) { sub_0206A8E4(param0, (2400 + 75)); return; } -void sub_0206AFA0 (FieldEvents * param0) +void sub_0206AFA0 (VarsFlags * param0) { sub_0206A8E4(param0, (2400 + 76)); return; } -BOOL sub_0206AFB0 (FieldEvents * param0, int param1, int param2) +BOOL sub_0206AFB0 (VarsFlags * param0, int param1, int param2) { return sub_0206A8F4(param0, param1, (2400 + 78) + param2); } -BOOL sub_0206AFC0 (FieldEvents * param0, int param1) +BOOL sub_0206AFC0 (VarsFlags * param0, int param1) { return sub_0206A8F4(param0, param1, (2400 + 77)); } -BOOL sub_0206AFD0 (FieldEvents * param0) +BOOL sub_0206AFD0 (VarsFlags * param0) { return sub_0206A8F4(param0, 2, (2400 + 23)); } diff --git a/src/unk_0206AFE0.c b/src/unk_0206AFE0.c index e32d19ef7c..a766ca4d23 100644 --- a/src/unk_0206AFE0.c +++ b/src/unk_0206AFE0.c @@ -14,17 +14,17 @@ #include "unk_0206A8DC.h" #include "unk_0206AFE0.h" -static BOOL sub_0206AFE0(FieldEvents * param0, u16 param1, u16 param2); -static u16 sub_0206B010(FieldEvents * param0, u16 param1); -BOOL sub_0206B044(FieldEvents * param0, u16 param1); -u16 sub_0206B054(FieldEvents * param0); -u16 sub_0206B064(FieldEvents * param0); -u16 sub_0206B08C(FieldEvents * param0); -void sub_0206B558(FieldEvents * param0, u16 param1); +static BOOL sub_0206AFE0(VarsFlags * param0, u16 param1, u16 param2); +static u16 sub_0206B010(VarsFlags * param0, u16 param1); +BOOL sub_0206B044(VarsFlags * param0, u16 param1); +u16 sub_0206B054(VarsFlags * param0); +u16 sub_0206B064(VarsFlags * param0); +u16 sub_0206B08C(VarsFlags * param0); +void sub_0206B558(VarsFlags * param0, u16 param1); void sub_0206B514(SaveData * param0); -static u8 sub_0206B4A4(FieldEvents * param0); +static u8 sub_0206B4A4(VarsFlags * param0); -static BOOL sub_0206AFE0 (FieldEvents * param0, u16 param1, u16 param2) +static BOOL sub_0206AFE0 (VarsFlags * param0, u16 param1, u16 param2) { u16 * v0 = sub_020508B8(param0, param1); @@ -41,7 +41,7 @@ static BOOL sub_0206AFE0 (FieldEvents * param0, u16 param1, u16 param2) return 1; } -static u16 sub_0206B010 (FieldEvents * param0, u16 param1) +static u16 sub_0206B010 (VarsFlags * param0, u16 param1) { u16 * v0 = sub_020508B8(param0, param1); @@ -52,27 +52,27 @@ static u16 sub_0206B010 (FieldEvents * param0, u16 param1) return *v0; } -BOOL sub_0206B024 (FieldEvents * param0, u16 param1) +BOOL sub_0206B024 (VarsFlags * param0, u16 param1) { return sub_0206AFE0(param0, (15 + (((0 + 0x4000) + 32) + 16)), param1); } -u16 sub_0206B034 (FieldEvents * param0) +u16 sub_0206B034 (VarsFlags * param0) { return sub_0206B010(param0, (15 + (((0 + 0x4000) + 32) + 16))); } -BOOL sub_0206B044 (FieldEvents * param0, u16 param1) +BOOL sub_0206B044 (VarsFlags * param0, u16 param1) { return sub_0206AFE0(param0, (0 + (((0 + 0x4000) + 32) + 16)), param1); } -u16 sub_0206B054 (FieldEvents * param0) +u16 sub_0206B054 (VarsFlags * param0) { return sub_0206B010(param0, (0 + (((0 + 0x4000) + 32) + 16))); } -u16 sub_0206B064 (FieldEvents * param0) +u16 sub_0206B064 (VarsFlags * param0) { u16 v0; u16 v1 = sub_0206B010(param0, (0 + (((0 + 0x4000) + 32) + 16))); @@ -88,7 +88,7 @@ u16 sub_0206B064 (FieldEvents * param0) return v0; } -u16 sub_0206B08C (FieldEvents * param0) +u16 sub_0206B08C (VarsFlags * param0) { u16 v0; u16 v1 = sub_0206B010(param0, (0 + (((0 + 0x4000) + 32) + 16))); @@ -104,39 +104,39 @@ u16 sub_0206B08C (FieldEvents * param0) return v0; } -u16 sub_0206B0B4 (FieldEvents * param0) +u16 sub_0206B0B4 (VarsFlags * param0) { return sub_0206B010(param0, (5 + (((0 + 0x4000) + 32) + 16))); } -BOOL sub_0206B0C4 (FieldEvents * param0, u16 param1) +BOOL sub_0206B0C4 (VarsFlags * param0, u16 param1) { return sub_0206AFE0(param0, (5 + (((0 + 0x4000) + 32) + 16)), param1); } -void FieldEvents_ResetVSSeeker (FieldEvents * param0) +void FieldEvents_ResetVSSeeker (VarsFlags * param0) { sub_0206A9D4(param0); sub_0206B118(param0, 0); return; } -u16 sub_0206B0E8 (FieldEvents * param0) +u16 sub_0206B0E8 (VarsFlags * param0) { return sub_0206B010(param0, (3 + (((0 + 0x4000) + 32) + 16))); } -BOOL sub_0206B0F8 (FieldEvents * param0, u16 param1) +BOOL sub_0206B0F8 (VarsFlags * param0, u16 param1) { return sub_0206AFE0(param0, (3 + (((0 + 0x4000) + 32) + 16)), param1); } -u16 sub_0206B108 (FieldEvents * param0) +u16 sub_0206B108 (VarsFlags * param0) { return sub_0206B010(param0, (4 + (((0 + 0x4000) + 32) + 16))); } -BOOL sub_0206B118 (FieldEvents * param0, u16 param1) +BOOL sub_0206B118 (VarsFlags * param0, u16 param1) { return sub_0206AFE0(param0, (4 + (((0 + 0x4000) + 32) + 16)), param1); } @@ -151,12 +151,12 @@ static int sub_0206B128 (int param0) return v0[param0]; } -void sub_0206B144 (FieldEvents * param0, int param1) +void sub_0206B144 (VarsFlags * param0, int param1) { sub_0206AFE0(param0, (19 + (((0 + 0x4000) + 32) + 16)) + param1, sub_0206B128(param1)); } -BOOL sub_0206B16C (FieldEvents * param0, int param1) +BOOL sub_0206B16C (VarsFlags * param0, int param1) { if (sub_0206B010(param0, (19 + (((0 + 0x4000) + 32) + 16)) + param1) == sub_0206B128(param1)) { return 1; @@ -175,17 +175,17 @@ static int sub_0206B194 (int param0) return v0[param0]; } -void sub_0206B1B0 (FieldEvents * param0, int param1) +void sub_0206B1B0 (VarsFlags * param0, int param1) { sub_0206AFE0(param0, (6 + (((0 + 0x4000) + 32) + 16)) + param1, sub_0206B194(param1)); } -void sub_0206B1D8 (FieldEvents * param0, int param1) +void sub_0206B1D8 (VarsFlags * param0, int param1) { sub_0206AFE0(param0, (6 + (((0 + 0x4000) + 32) + 16)) + param1, 0); } -BOOL sub_0206B1F0 (FieldEvents * param0, int param1) +BOOL sub_0206B1F0 (VarsFlags * param0, int param1) { if (sub_0206B010(param0, (6 + (((0 + 0x4000) + 32) + 16)) + param1) == sub_0206B194(param1)) { return 1; @@ -194,17 +194,17 @@ BOOL sub_0206B1F0 (FieldEvents * param0, int param1) } } -BOOL sub_0206B218 (FieldEvents * param0) +BOOL sub_0206B218 (VarsFlags * param0) { return sub_0206AFE0(param0, (10 + (((0 + 0x4000) + 32) + 16)), 0); } -u16 sub_0206B228 (FieldEvents * param0) +u16 sub_0206B228 (VarsFlags * param0) { return sub_0206B010(param0, (10 + (((0 + 0x4000) + 32) + 16))); } -BOOL sub_0206B238 (FieldEvents * param0) +BOOL sub_0206B238 (VarsFlags * param0) { u16 v0; @@ -219,17 +219,17 @@ BOOL sub_0206B238 (FieldEvents * param0) return sub_0206AFE0(param0, (10 + (((0 + 0x4000) + 32) + 16)), v0); } -u16 sub_0206B260 (FieldEvents * param0) +u16 sub_0206B260 (VarsFlags * param0) { return sub_0206B010(param0, (11 + (((0 + 0x4000) + 32) + 16))); } -BOOL sub_0206B270 (FieldEvents * param0, u16 param1) +BOOL sub_0206B270 (VarsFlags * param0, u16 param1) { return sub_0206AFE0(param0, (11 + (((0 + 0x4000) + 32) + 16)), param1); } -void sub_0206B280 (FieldEvents * param0, u32 param1) +void sub_0206B280 (VarsFlags * param0, u32 param1) { u16 v0, v1; @@ -239,7 +239,7 @@ void sub_0206B280 (FieldEvents * param0, u32 param1) sub_0206AFE0(param0, (12 + (((0 + 0x4000) + 32) + 16)), v1); } -u32 sub_0206B2A4 (FieldEvents * param0) +u32 sub_0206B2A4 (VarsFlags * param0) { u16 v0, v1; @@ -249,7 +249,7 @@ u32 sub_0206B2A4 (FieldEvents * param0) return (v1 << 16) | v0; } -void sub_0206B2C8 (FieldEvents * param0) +void sub_0206B2C8 (VarsFlags * param0) { u16 v0, v1; @@ -261,7 +261,7 @@ void sub_0206B2C8 (FieldEvents * param0) void sub_0206B2E4 (SaveData * param0, u16 param1) { - FieldEvents * v0 = SaveData_GetFieldEvents(param0); + VarsFlags * v0 = SaveData_GetVarsFlags(param0); u32 v1; v1 = sub_0202B428(sub_0202B4A0(param0)); @@ -270,26 +270,26 @@ void sub_0206B2E4 (SaveData * param0, u16 param1) sub_0206B280(v0, v1); } -u16 sub_0206B314 (FieldEvents * param0) +u16 sub_0206B314 (VarsFlags * param0) { return sub_0206B010(param0, (17 + (((0 + 0x4000) + 32) + 16))); } -BOOL sub_0206B324 (FieldEvents * param0, u16 param1) +BOOL sub_0206B324 (VarsFlags * param0, u16 param1) { return sub_0206AFE0(param0, (17 + (((0 + 0x4000) + 32) + 16)), param1); } void sub_0206B334 (SaveData * param0) { - FieldEvents * v0 = SaveData_GetFieldEvents(param0); + VarsFlags * v0 = SaveData_GetVarsFlags(param0); u32 v1; v1 = (LCRNG_Next() % 98) + 2; sub_0206B324(v0, v1); } -u16 sub_0206B354 (FieldEvents * param0) +u16 sub_0206B354 (VarsFlags * param0) { u16 v0; @@ -297,12 +297,12 @@ u16 sub_0206B354 (FieldEvents * param0) return v0; } -BOOL sub_0206B364 (FieldEvents * param0, u16 param1) +BOOL sub_0206B364 (VarsFlags * param0, u16 param1) { return sub_0206AFE0(param0, (14 + (((0 + 0x4000) + 32) + 16)), param1); } -u16 sub_0206B374 (FieldEvents * param0) +u16 sub_0206B374 (VarsFlags * param0) { u16 v0; @@ -310,12 +310,12 @@ u16 sub_0206B374 (FieldEvents * param0) return v0; } -BOOL sub_0206B384 (FieldEvents * param0, u16 param1) +BOOL sub_0206B384 (VarsFlags * param0, u16 param1) { return sub_0206AFE0(param0, (25 + (((0 + 0x4000) + 32) + 16)), param1); } -u16 sub_0206B394 (FieldEvents * param0) +u16 sub_0206B394 (VarsFlags * param0) { u16 v0; @@ -323,12 +323,12 @@ u16 sub_0206B394 (FieldEvents * param0) return v0; } -BOOL sub_0206B3A4 (FieldEvents * param0, u16 param1) +BOOL sub_0206B3A4 (VarsFlags * param0, u16 param1) { return sub_0206AFE0(param0, (16 + (((0 + 0x4000) + 32) + 16)), param1); } -BOOL sub_0206B3B4 (FieldEvents * param0) +BOOL sub_0206B3B4 (VarsFlags * param0) { u16 v0; @@ -343,62 +343,62 @@ BOOL sub_0206B3B4 (FieldEvents * param0) return sub_0206AFE0(param0, (18 + (((0 + 0x4000) + 32) + 16)), v0); } -u16 sub_0206B3DC (FieldEvents * param0) +u16 sub_0206B3DC (VarsFlags * param0) { return sub_0206B010(param0, (18 + (((0 + 0x4000) + 32) + 16))); } -u16 sub_0206B3EC (FieldEvents * param0) +u16 sub_0206B3EC (VarsFlags * param0) { return sub_0206B010(param0, (36 + (((0 + 0x4000) + 32) + 16))); } -BOOL sub_0206B3FC (FieldEvents * param0, u16 param1) +BOOL sub_0206B3FC (VarsFlags * param0, u16 param1) { return sub_0206AFE0(param0, (36 + (((0 + 0x4000) + 32) + 16)), param1); } -u16 sub_0206B40C (FieldEvents * param0) +u16 sub_0206B40C (VarsFlags * param0) { return sub_0206B010(param0, (23 + (((0 + 0x4000) + 32) + 16))); } -BOOL sub_0206B41C (FieldEvents * param0, u16 param1) +BOOL sub_0206B41C (VarsFlags * param0, u16 param1) { return sub_0206AFE0(param0, (23 + (((0 + 0x4000) + 32) + 16)), param1); } -u16 sub_0206B42C (FieldEvents * param0) +u16 sub_0206B42C (VarsFlags * param0) { return sub_0206B010(param0, (24 + (((0 + 0x4000) + 32) + 16))); } -BOOL sub_0206B43C (FieldEvents * param0, u16 param1) +BOOL sub_0206B43C (VarsFlags * param0, u16 param1) { return sub_0206AFE0(param0, (24 + (((0 + 0x4000) + 32) + 16)), param1); } -u16 sub_0206B44C (FieldEvents * param0) +u16 sub_0206B44C (VarsFlags * param0) { return sub_0206B010(param0, (26 + (((0 + 0x4000) + 32) + 16))); } -void sub_0206B45C (FieldEvents * param0, u16 param1) +void sub_0206B45C (VarsFlags * param0, u16 param1) { sub_0206AFE0(param0, (26 + (((0 + 0x4000) + 32) + 16)), param1); } -void sub_0206B46C (FieldEvents * param0, u16 param1) +void sub_0206B46C (VarsFlags * param0, u16 param1) { sub_0206AFE0(param0, (27 + (((0 + 0x4000) + 32) + 16)), param1); } -u16 sub_0206B47C (FieldEvents * param0) +u16 sub_0206B47C (VarsFlags * param0) { return sub_0206B010(param0, (27 + (((0 + 0x4000) + 32) + 16))); } -void sub_0206B48C (FieldEvents * param0, u16 param1) +void sub_0206B48C (VarsFlags * param0, u16 param1) { sub_0206AFE0(param0, (29 + (((0 + 0x4000) + 32) + 16)), (param1 + 1)); } @@ -415,7 +415,7 @@ static const u8 Unk_020EFA6C[] = { 0xF }; -static u8 sub_0206B4A4 (FieldEvents * param0) +static u8 sub_0206B4A4 (VarsFlags * param0) { int v0; u16 v1, v2, v3; @@ -449,7 +449,7 @@ static u8 sub_0206B4A4 (FieldEvents * param0) void sub_0206B514 (SaveData * param0) { u32 v0; - FieldEvents * v1 = SaveData_GetFieldEvents(param0); + VarsFlags * v1 = SaveData_GetVarsFlags(param0); FieldOverworldState * v2 = SaveData_GetFieldOverworldState(param0); Location * location = sub_0203A720(v2); @@ -462,93 +462,93 @@ void sub_0206B514 (SaveData * param0) return; } -void sub_0206B558 (FieldEvents * param0, u16 param1) +void sub_0206B558 (VarsFlags * param0, u16 param1) { sub_0206AFE0(param0, (30 + (((0 + 0x4000) + 32) + 16)), param1); sub_0206AFE0(param0, (42 + (((0 + 0x4000) + 32) + 16)), (LCRNG_Next() % 5)); } -u16 sub_0206B588 (FieldEvents * param0) +u16 sub_0206B588 (VarsFlags * param0) { return sub_0206B010(param0, (32 + (((0 + 0x4000) + 32) + 16))); } -u16 sub_0206B598 (FieldEvents * param0) +u16 sub_0206B598 (VarsFlags * param0) { return sub_0206B010(param0, (33 + (((0 + 0x4000) + 32) + 16))); } -u16 sub_0206B5A8 (FieldEvents * param0) +u16 sub_0206B5A8 (VarsFlags * param0) { return sub_0206B010(param0, (34 + (((0 + 0x4000) + 32) + 16))); } -u16 sub_0206B5B8 (FieldEvents * param0) +u16 sub_0206B5B8 (VarsFlags * param0) { return sub_0206B010(param0, (35 + (((0 + 0x4000) + 32) + 16))); } -u16 sub_0206B5C8 (FieldEvents * param0) +u16 sub_0206B5C8 (VarsFlags * param0) { return sub_0206B010(param0, (31 + (((0 + 0x4000) + 32) + 16))); } -u16 sub_0206B5D8 (FieldEvents * param0) +u16 sub_0206B5D8 (VarsFlags * param0) { return sub_0206B010(param0, (37 + (((0 + 0x4000) + 32) + 16))); } -void sub_0206B5E8 (FieldEvents * param0, u16 param1) +void sub_0206B5E8 (VarsFlags * param0, u16 param1) { sub_0206AFE0(param0, (37 + (((0 + 0x4000) + 32) + 16)), param1); } -u16 sub_0206B5F8 (FieldEvents * param0) +u16 sub_0206B5F8 (VarsFlags * param0) { return sub_0206B010(param0, (38 + (((0 + 0x4000) + 32) + 16))); } -void sub_0206B608 (FieldEvents * param0, u16 param1) +void sub_0206B608 (VarsFlags * param0, u16 param1) { sub_0206AFE0(param0, (38 + (((0 + 0x4000) + 32) + 16)), param1); } -u16 sub_0206B618 (FieldEvents * param0) +u16 sub_0206B618 (VarsFlags * param0) { return sub_0206B010(param0, (39 + (((0 + 0x4000) + 32) + 16))); } -void sub_0206B628 (FieldEvents * param0, u16 param1) +void sub_0206B628 (VarsFlags * param0, u16 param1) { sub_0206AFE0(param0, (39 + (((0 + 0x4000) + 32) + 16)), param1); } -void sub_0206B638 (FieldEvents * param0, u16 param1) +void sub_0206B638 (VarsFlags * param0, u16 param1) { sub_0206AFE0(param0, (40 + (((0 + 0x4000) + 32) + 16)), param1); } -void sub_0206B648 (FieldEvents * param0, u16 param1) +void sub_0206B648 (VarsFlags * param0, u16 param1) { sub_0206AFE0(param0, (41 + (((0 + 0x4000) + 32) + 16)), param1); } -void sub_0206B658 (FieldEvents * param0, u16 param1) +void sub_0206B658 (VarsFlags * param0, u16 param1) { sub_0206AFE0(param0, (46 + (((0 + 0x4000) + 32) + 16)), param1); } -void sub_0206B668 (FieldEvents * param0, u16 param1) +void sub_0206B668 (VarsFlags * param0, u16 param1) { sub_0206AFE0(param0, (47 + (((0 + 0x4000) + 32) + 16)), param1); } -void sub_0206B678 (FieldEvents * param0, u16 param1) +void sub_0206B678 (VarsFlags * param0, u16 param1) { sub_0206AFE0(param0, (48 + (((0 + 0x4000) + 32) + 16)), param1); } -void sub_0206B688 (FieldEvents * param0, u16 param1, u16 param2) +void sub_0206B688 (VarsFlags * param0, u16 param1, u16 param2) { switch (param1) { case 481: @@ -571,17 +571,17 @@ void sub_0206B688 (FieldEvents * param0, u16 param1, u16 param2) return; } -u16 sub_0206B6DC (FieldEvents * param0) +u16 sub_0206B6DC (VarsFlags * param0) { return sub_0206B010(param0, (43 + (((0 + 0x4000) + 32) + 16))); } -void sub_0206B6EC (FieldEvents * param0, u16 param1) +void sub_0206B6EC (VarsFlags * param0, u16 param1) { sub_0206AFE0(param0, (43 + (((0 + 0x4000) + 32) + 16)), param1); } -u16 sub_0206B6FC (FieldEvents * param0) +u16 sub_0206B6FC (VarsFlags * param0) { return sub_0206B010(param0, (52 + (((0 + 0x4000) + 32) + 16))); } diff --git a/src/unk_0206B70C.c b/src/unk_0206B70C.c index 803a514b90..ac420aefd8 100644 --- a/src/unk_0206B70C.c +++ b/src/unk_0206B70C.c @@ -78,7 +78,7 @@ void sub_0206B70C (FieldSystem * fieldSystem, UnkStruct_0203D8AC * param1, int p int v1 = 0, v2 = 0, v3 = 0; int x, z, v6; UnkStruct_020556C4 * v7; - FieldEvents * v8 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v8 = SaveData_GetVarsFlags(fieldSystem->saveData); FieldOverworldState * v9 = SaveData_GetFieldOverworldState(fieldSystem->saveData); Location * v10 = sub_0203A72C(v9); @@ -157,7 +157,7 @@ static void sub_0206B878 (FieldSystem * fieldSystem, UnkStruct_0203D8AC * param1 int v3; UnkStruct_0206B878 * v4; UnkUnion_0206B878 * v5; - FieldEvents * v6 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v6 = SaveData_GetVarsFlags(fieldSystem->saveData); FS_InitFile(&v0); diff --git a/src/unk_0206C0E8.c b/src/unk_0206C0E8.c index 91aba5e694..7232504b60 100644 --- a/src/unk_0206C0E8.c +++ b/src/unk_0206C0E8.c @@ -70,7 +70,7 @@ static BOOL sub_0206C120 (TaskManager * taskMan) break; case 2: { - FieldEvents * v2 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v2 = SaveData_GetVarsFlags(fieldSystem->saveData); if (v1->unk_0D == 0) { sub_0206AE0C(v2); diff --git a/src/unk_0206CCB0.c b/src/unk_0206CCB0.c index ff884d4f2b..2fe9750dc3 100644 --- a/src/unk_0206CCB0.c +++ b/src/unk_0206CCB0.c @@ -1251,7 +1251,7 @@ static int sub_0206DB38 (FieldSystem * fieldSystem, StringTemplate * param1, Unk static BOOL sub_0206DB48 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) { - return inline_0208BE68(SaveData_GetFieldEvents(fieldSystem->saveData), 6); + return inline_0208BE68(SaveData_GetVarsFlags(fieldSystem->saveData), 6); } void sub_0206DB5C (FieldSystem * fieldSystem, u8 param1) @@ -1276,7 +1276,7 @@ static int sub_0206DB74 (FieldSystem * fieldSystem, StringTemplate * param1, Unk static BOOL sub_0206DB9C (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) { - return inline_0208BE68(SaveData_GetFieldEvents(fieldSystem->saveData), 6); + return inline_0208BE68(SaveData_GetVarsFlags(fieldSystem->saveData), 6); } void sub_0206DBB0 (SaveData * param0, u32 param1, Pokemon * param2, BOOL param3) @@ -1315,7 +1315,7 @@ static BOOL sub_0206DC3C (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * pa return 0; } - return inline_0208BE68(SaveData_GetFieldEvents(fieldSystem->saveData), 17); + return inline_0208BE68(SaveData_GetVarsFlags(fieldSystem->saveData), 17); } void sub_0206DC6C (FieldSystem * fieldSystem, u32 param1, Pokemon * param2) @@ -1584,7 +1584,7 @@ static int sub_0206E018 (FieldSystem * fieldSystem, StringTemplate * param1, Unk static BOOL sub_0206E04C (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) { - return inline_0208BE68(SaveData_GetFieldEvents(fieldSystem->saveData), 17); + return inline_0208BE68(SaveData_GetVarsFlags(fieldSystem->saveData), 17); } void sub_0206E060 (SaveData * param0) @@ -1614,7 +1614,7 @@ static int sub_0206E098 (FieldSystem * fieldSystem, StringTemplate * param1, Unk static BOOL sub_0206E0CC (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) { - return inline_0208BE68(SaveData_GetFieldEvents(fieldSystem->saveData), 9); + return inline_0208BE68(SaveData_GetVarsFlags(fieldSystem->saveData), 9); } void sub_0206E0E0 (FieldSystem * fieldSystem, u16 param1) @@ -1648,7 +1648,7 @@ static int sub_0206E118 (FieldSystem * fieldSystem, StringTemplate * param1, Unk static BOOL sub_0206E160 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) { - return inline_0208BE68(SaveData_GetFieldEvents(fieldSystem->saveData), 17); + return inline_0208BE68(SaveData_GetVarsFlags(fieldSystem->saveData), 17); } void sub_0206E174 (FieldSystem * fieldSystem, u16 param1) @@ -1910,7 +1910,7 @@ static int sub_0206E5E4 (FieldSystem * fieldSystem, StringTemplate * param1, Unk static BOOL sub_0206E654 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) { - return inline_0208BE68(SaveData_GetFieldEvents(fieldSystem->saveData), 17); + return inline_0208BE68(SaveData_GetVarsFlags(fieldSystem->saveData), 17); } void sub_0206E668 (FieldSystem * fieldSystem, u16 param1) @@ -2039,7 +2039,7 @@ static int sub_0206E7AC (FieldSystem * fieldSystem, StringTemplate * param1, Unk static BOOL sub_0206E834 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) { - return inline_0208BE68(SaveData_GetFieldEvents(fieldSystem->saveData), 17); + return inline_0208BE68(SaveData_GetVarsFlags(fieldSystem->saveData), 17); } static const u8 Unk_020EFD34[] = { @@ -2529,7 +2529,7 @@ static int sub_0206EBE8 (FieldSystem * fieldSystem) u8 v0[NELEMS(Unk_020EFD3C)]; u8 v1[NELEMS(Unk_020F0074) / 2]; int v2, v3; - FieldEvents * v4 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v4 = SaveData_GetVarsFlags(fieldSystem->saveData); for (v2 = 0; v2 < NELEMS(Unk_020EFD3C); v2++) { v0[v2] = inline_0208BE68(v4, Unk_020EFD3C[v2]); @@ -2572,7 +2572,7 @@ static int sub_0206EC90 (FieldSystem * fieldSystem, StringTemplate * param1, Unk static BOOL sub_0206ECFC (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) { - FieldEvents * v0 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(fieldSystem->saveData); return inline_0208BE68(v0, 9); } @@ -2744,13 +2744,13 @@ static int sub_0206EF7C (FieldSystem * fieldSystem, StringTemplate * param1, Unk v0 = 0; - if (sub_0206A954(SaveData_GetFieldEvents(fieldSystem->saveData)) == 1) { + if (sub_0206A954(SaveData_GetVarsFlags(fieldSystem->saveData)) == 1) { v0 = (LCRNG_Next() % 8); - } else if (inline_0208BE68(SaveData_GetFieldEvents(fieldSystem->saveData), 11) == 1) { + } else if (inline_0208BE68(SaveData_GetVarsFlags(fieldSystem->saveData), 11) == 1) { v0 = (LCRNG_Next() % 5); - } else if (inline_0208BE68(SaveData_GetFieldEvents(fieldSystem->saveData), 10) == 1) { + } else if (inline_0208BE68(SaveData_GetVarsFlags(fieldSystem->saveData), 10) == 1) { v0 = (LCRNG_Next() % 4); - } else if (inline_0208BE68(SaveData_GetFieldEvents(fieldSystem->saveData), 18) == 1) { + } else if (inline_0208BE68(SaveData_GetVarsFlags(fieldSystem->saveData), 18) == 1) { v0 = (LCRNG_Next() % 2); } diff --git a/src/unk_02070428.c b/src/unk_02070428.c index 860a5556f1..3f085cdf81 100644 --- a/src/unk_02070428.c +++ b/src/unk_02070428.c @@ -35,16 +35,16 @@ void sub_02070428 (FieldSystem * fieldSystem, BOOL param1) void FieldSystem_InitFlagsNoWarp (FieldSystem * fieldSystem) { sub_020705DC(fieldSystem); - sub_0206AF1C(SaveData_GetFieldEvents(fieldSystem->saveData), 0); + sub_0206AF1C(SaveData_GetVarsFlags(fieldSystem->saveData), 0); - inline_0204E650_1(SaveData_GetFieldEvents(fieldSystem->saveData)); + inline_0204E650_1(SaveData_GetVarsFlags(fieldSystem->saveData)); sub_0203A8E8(fieldSystem, fieldSystem->location->mapId); sub_0202D9EC(sub_0202D834(fieldSystem->saveData), 0); fieldSystem->unk_78.unk_00 = 0; - if (!sub_0206AE5C(SaveData_GetFieldEvents(fieldSystem->saveData))) { + if (!sub_0206AE5C(SaveData_GetVarsFlags(fieldSystem->saveData))) { UnkStruct_0202D7B0 * v0; v0 = sub_0202D834(fieldSystem->saveData); @@ -63,10 +63,10 @@ void FieldSystem_InitFlagsWarp (FieldSystem * fieldSystem) sub_02070610(fieldSystem); } - sub_0206AF1C(SaveData_GetFieldEvents(fieldSystem->saveData), 0); - sub_0206AE9C(SaveData_GetFieldEvents(fieldSystem->saveData)); + sub_0206AF1C(SaveData_GetVarsFlags(fieldSystem->saveData), 0); + sub_0206AE9C(SaveData_GetVarsFlags(fieldSystem->saveData)); - inline_0204E650_1(SaveData_GetFieldEvents(fieldSystem->saveData)); + inline_0204E650_1(SaveData_GetVarsFlags(fieldSystem->saveData)); sub_0203A8E8(fieldSystem, fieldSystem->location->mapId); sub_0202D9EC(sub_0202D834(fieldSystem->saveData), 0); @@ -81,7 +81,7 @@ void FieldSystem_InitFlagsWarp (FieldSystem * fieldSystem) } if (!MapHeader_IsCave(fieldSystem->location->mapId)) { - FieldEvents * v1 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v1 = SaveData_GetVarsFlags(fieldSystem->saveData); sub_0206AECC(v1); sub_0206AEFC(v1); @@ -107,24 +107,24 @@ void FieldSystem_InitFlagsWarp (FieldSystem * fieldSystem) void sub_0207056C (FieldSystem * fieldSystem) { - sub_0206AE4C(SaveData_GetFieldEvents(fieldSystem->saveData)); + sub_0206AE4C(SaveData_GetVarsFlags(fieldSystem->saveData)); sub_0206C354(sub_0202D834(fieldSystem->saveData)); } void sub_02070588 (FieldSystem * fieldSystem) { - sub_0206AE4C(SaveData_GetFieldEvents(fieldSystem->saveData)); + sub_0206AE4C(SaveData_GetVarsFlags(fieldSystem->saveData)); sub_0206C354(sub_0202D834(fieldSystem->saveData)); } void sub_020705A4 (FieldSystem * fieldSystem) { - sub_0206AE4C(SaveData_GetFieldEvents(fieldSystem->saveData)); + sub_0206AE4C(SaveData_GetVarsFlags(fieldSystem->saveData)); } void sub_020705B4 (FieldSystem * fieldSystem) { - FieldEvents * v0 = SaveData_GetFieldEvents(fieldSystem->saveData); + VarsFlags * v0 = SaveData_GetVarsFlags(fieldSystem->saveData); sub_0206A974(v0); sub_0206B024(v0, 0); diff --git a/src/unk_0207070C.c b/src/unk_0207070C.c index e28a17a28b..05cc2b6b0e 100644 --- a/src/unk_0207070C.c +++ b/src/unk_0207070C.c @@ -123,12 +123,12 @@ static inline BOOL inline_02070950 (const UnkStruct_02070950 * param0, int param static inline BOOL inline_02070A24 (const UnkStruct_02070950 * param0) { - return sub_0206A984(SaveData_GetFieldEvents(param0->fieldSystem->saveData)); + return sub_0206A984(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); } static inline BOOL inline_02070EEC (const UnkStruct_02070950 * param0) { - if ((sub_0206AE5C(SaveData_GetFieldEvents(param0->fieldSystem->saveData)) == 1) || (sub_0206AE8C(SaveData_GetFieldEvents(param0->fieldSystem->saveData)) == 1)) { + if ((sub_0206AE5C(SaveData_GetVarsFlags(param0->fieldSystem->saveData)) == 1) || (sub_0206AE8C(SaveData_GetVarsFlags(param0->fieldSystem->saveData)) == 1)) { return 1; } @@ -137,7 +137,7 @@ static inline BOOL inline_02070EEC (const UnkStruct_02070950 * param0) static inline BOOL inline_020710A4 (const UnkStruct_02070950 * param0) { - if (sub_0206AE8C(SaveData_GetFieldEvents(param0->fieldSystem->saveData)) == 1) { + if (sub_0206AE8C(SaveData_GetVarsFlags(param0->fieldSystem->saveData)) == 1) { return 1; } diff --git a/src/unk_02071D40.c b/src/unk_02071D40.c index 5415975395..6fdac8ccc0 100644 --- a/src/unk_02071D40.c +++ b/src/unk_02071D40.c @@ -77,7 +77,7 @@ void sub_02071D40 (const u8 param0, const u8 param1, const u8 param2, const u8 p sub_02055BF4(fieldSystem, &v4, &v6); sub_02055C10(fieldSystem, &v5, &v6); - sub_0207207C(sub_0206A954(SaveData_GetFieldEvents(fieldSystem->saveData)), v7, &v4, &v5, &v6, param1, param5); + sub_0207207C(sub_0206A954(SaveData_GetVarsFlags(fieldSystem->saveData)), v7, &v4, &v5, &v6, param1, param5); } { @@ -127,13 +127,13 @@ u8 sub_02071F28 (FieldSystem * fieldSystem) u8 v0; SaveData * v1; UnkStruct_0202CD88 * v2; - FieldEvents * v3; + VarsFlags * v3; SecretBaseRecord * v4; UnkStruct_0203068C * v5; v1 = FieldSystem_SaveData(fieldSystem); v2 = sub_0202CD88(v1); - v3 = SaveData_GetFieldEvents(v1); + v3 = SaveData_GetVarsFlags(v1); v4 = SaveData_SecretBaseRecord(v1); v5 = sub_0203068C(v1); v0 = 0; diff --git a/src/unk_0207DA28.c b/src/unk_0207DA28.c index 48acd98d84..07f4aa7e5e 100644 --- a/src/unk_0207DA28.c +++ b/src/unk_0207DA28.c @@ -108,7 +108,7 @@ static BOOL sub_0207DA28 (TaskManager * param0) break; case 3: if (sub_02039074(fieldSystem->saveData)) { - sub_0206AF5C(SaveData_GetFieldEvents(fieldSystem->saveData)); + sub_0206AF5C(SaveData_GetVarsFlags(fieldSystem->saveData)); } switch (v2->unk_00->unk_04) { diff --git a/src/unk_0208BA78.c b/src/unk_0208BA78.c index 8655f19282..e050a7ab7e 100644 --- a/src/unk_0208BA78.c +++ b/src/unk_0208BA78.c @@ -413,9 +413,9 @@ const OverlayManagerTemplate * sub_0208BE5C (int param0) BOOL sub_0208BE68 (UnkStruct_0208C06C * param0) { - FieldEvents * v0; + VarsFlags * v0; - v0 = SaveData_GetFieldEvents(param0->unk_830); + v0 = SaveData_GetVarsFlags(param0->unk_830); return inline_0208BE68(v0, 53); } diff --git a/src/unk_020933F8.c b/src/unk_020933F8.c index 5db864de01..13b51c606f 100644 --- a/src/unk_020933F8.c +++ b/src/unk_020933F8.c @@ -1598,9 +1598,9 @@ void sub_02094C44 (UnkStruct_02095C48 * param0, SaveData * param1, u32 param2, J if (param0->unk_155 == 0) { { - FieldEvents * v1; + VarsFlags * v1; - v1 = SaveData_GetFieldEvents(param0->unk_1970); + v1 = SaveData_GetVarsFlags(param0->unk_1970); if ((param0->unk_00.unk_111 == 2) && (param0->unk_00.unk_110 >= 3) && (sub_02094790(param0) == 0)) { if (sub_0206AAA8(v1, param0->unk_00.unk_10F) == 0) { diff --git a/src/unk_0209747C.c b/src/unk_0209747C.c index ed61fa2cab..8d463cc6f1 100644 --- a/src/unk_0209747C.c +++ b/src/unk_0209747C.c @@ -41,7 +41,7 @@ UnkStruct_0209747C * sub_0209747C (u32 param0, u32 param1, SaveData * param2, u3 v0->unk_01 = param1; v0->unk_0C = SaveData_Pokedex(param2); v0->unk_10 = sub_02014EC4(param2); - v0->unk_04 = sub_0206A954(SaveData_GetFieldEvents(param2)); + v0->unk_04 = sub_0206A954(SaveData_GetVarsFlags(param2)); v0->unk_05 = 0; v0->unk_02 = 1; v0->unk_03 = 0;