diff --git a/include/constants/heap.h b/include/constants/heap.h index acb649ec26..ff534f688f 100644 --- a/include/constants/heap.h +++ b/include/constants/heap.h @@ -8,7 +8,17 @@ enum HeapId { HEAP_ID_APPLICATION, HEAP_ID_BATTLE = 5, + + HEAP_ID_POKETCH_MAIN = 7, + HEAP_ID_POKETCH_APP, + HEAP_ID_COMMUNICATION = 15, }; +enum HeapSize +{ + HEAP_SIZE_POKETCH_MAIN = 0xc000, + HEAP_SIZE_POKETCH_APP = 0xc000 +}; + #endif // POKEPLATINUM_CONSTANTS_HEAP_H diff --git a/include/field/field_system_sub2_t.h b/include/field/field_system_sub2_t.h index 7b94c62e45..38a19797de 100644 --- a/include/field/field_system_sub2_t.h +++ b/include/field/field_system_sub2_t.h @@ -8,7 +8,7 @@ #include "overlay005/struct_ov5_021DD9C8_decl.h" #include "overlay005/struct_ov5_021EF3BC_decl.h" #include "overlay005/struct_ov5_021EF4F8_decl.h" -#include "overlay025/struct_ov25_02253CE0_decl.h" +#include "overlay025/poketch_system.h" struct FieldSystem_sub2_t { BOOL unk_00; @@ -16,7 +16,7 @@ struct FieldSystem_sub2_t { UnkStruct_ov5_021DD9C8 * unk_08; UnkStruct_ov5_021D5EF8 * unk_0C; UnkStruct_ov5_021D5CB0 * unk_10; - UnkStruct_ov25_02253CE0 * unk_14; + PoketchSystem * unk_14; UnkStruct_02055CBC * unk_18; UnkStruct_ov5_021EF3BC * unk_1C; UnkStruct_ov5_021EF4F8 * unk_20; diff --git a/include/heap.h b/include/heap.h index fda1b0e853..5b9d7fdaf5 100644 --- a/include/heap.h +++ b/include/heap.h @@ -2,6 +2,7 @@ #define POKEPLATINUM_UNK_02017E74_H #include "struct_defs/struct_02017E74.h" +#include "constants/heap.h" #include diff --git a/include/overlay025/funcptr_ov25_02254238.h b/include/overlay025/funcptr_ov25_02254238.h deleted file mode 100644 index f68dc87ac7..0000000000 --- a/include/overlay025/funcptr_ov25_02254238.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef POKEPLATINUM_FUNCPTR_OV25_02254238_H -#define POKEPLATINUM_FUNCPTR_OV25_02254238_H - -#include "struct_decls/struct_02018340_decl.h" -#include "overlay025/struct_ov25_0225424C_decl.h" - -typedef BOOL (* UnkFuncPtr_ov25_02254238)(void **, UnkStruct_ov25_0225424C *, BGL *, u32); - -#endif // POKEPLATINUM_FUNCPTR_OV25_02254238_H diff --git a/include/overlay025/funcptr_ov25_02254238_1.h b/include/overlay025/funcptr_ov25_02254238_1.h deleted file mode 100644 index 6f2eb3fccd..0000000000 --- a/include/overlay025/funcptr_ov25_02254238_1.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_FUNCPTR_OV25_02254238_1_H -#define POKEPLATINUM_FUNCPTR_OV25_02254238_1_H - -typedef void (* UnkFuncPtr_ov25_02254238_1)(void *); - -#endif // POKEPLATINUM_FUNCPTR_OV25_02254238_1_H diff --git a/include/overlay025/funcptr_ov25_02254274.h b/include/overlay025/funcptr_ov25_02254274.h deleted file mode 100644 index 5595c41843..0000000000 --- a/include/overlay025/funcptr_ov25_02254274.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_FUNCPTR_OV25_02254274_H -#define POKEPLATINUM_FUNCPTR_OV25_02254274_H - -typedef void (* UnkFuncPtr_ov25_02254274)(void *); - -#endif // POKEPLATINUM_FUNCPTR_OV25_02254274_H diff --git a/include/overlay025/ov25_02253CE0.h b/include/overlay025/ov25_02253CE0.h deleted file mode 100644 index 7f5e95613f..0000000000 --- a/include/overlay025/ov25_02253CE0.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef POKEPLATINUM_OV25_02253CE0_H -#define POKEPLATINUM_OV25_02253CE0_H - -#include "struct_decls/struct_02018340_decl.h" -#include "field/field_system_decl.h" -#include "poketch_data.h" -#include "savedata.h" -#include "overlay025/struct_ov25_02253CE0_decl.h" -#include "overlay025/funcptr_ov25_02254238.h" -#include "overlay025/funcptr_ov25_02254238_1.h" -#include "overlay025/struct_ov25_0225424C_decl.h" -#include "overlay025/funcptr_ov25_02254274.h" -#include "overlay025/struct_ov25_02254560_decl.h" -#include "overlay025/struct_ov25_02255B34_decl.h" - -#include - -void ov25_02253CE8(FieldSystem * param0, UnkStruct_ov25_02253CE0 ** param1, SaveData * param2, BGL * param3, NNSG2dOamManagerInstance * param4); -void ov25_02253D5C(UnkStruct_ov25_02253CE0 * param0); -BOOL ov25_02253D70(UnkStruct_ov25_02253CE0 * param0); -void ov25_02253D7C(UnkStruct_ov25_02253CE0 * param0, int param1, u32 param2); -BOOL ov25_02253DD4(UnkStruct_ov25_02253CE0 * param0); -int ov25_02253DD8(UnkStruct_ov25_02253CE0 * param0); -void ov25_02254238(UnkFuncPtr_ov25_02254238 param0, UnkFuncPtr_ov25_02254238_1 param1); -void ov25_0225424C(UnkStruct_ov25_0225424C * param0); -void ov25_02254260(UnkStruct_ov25_0225424C * param0); -void ov25_02254274(UnkFuncPtr_ov25_02254274 param0, void * param1); -UnkStruct_ov25_02254560 * ov25_02254418(void); -void ov25_02254424(u32 param0); -void ov25_02254444(u32 param0, u32 param1); -BOOL ov25_0225446C(u32 * param0, u32 * param1); -BOOL ov25_022544BC(u32 * param0, u32 * param1); -BOOL ov25_0225450C(const UnkStruct_ov25_0225424C * param0); -void ov25_02254518(const UnkStruct_ov25_0225424C * param0, UnkStruct_ov25_02255B34 * param1); -BOOL ov25_02254534(const UnkStruct_ov25_0225424C * param0); -BOOL ov25_02254538(const UnkStruct_ov25_0225424C * param0); -FieldSystem * ov25_0225453C(const UnkStruct_ov25_0225424C * param0); -PoketchData * ov25_02254540(const UnkStruct_ov25_0225424C * param0); -SaveData * ov25_02254544(const UnkStruct_ov25_0225424C * param0); -int ov25_02254548(const UnkStruct_ov25_0225424C * param0); - -#endif // POKEPLATINUM_OV25_02253CE0_H diff --git a/include/overlay025/ov25_02254560.h b/include/overlay025/ov25_02254560.h index 11b3031b18..2b1d7c0c4b 100644 --- a/include/overlay025/ov25_02254560.h +++ b/include/overlay025/ov25_02254560.h @@ -2,14 +2,14 @@ #define POKEPLATINUM_OV25_02254560_H #include "struct_decls/struct_02018340_decl.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_02254560_1.h" #include "overlay025/struct_ov25_02254560_decl.h" #include "overlay025/struct_ov25_022555E8_decl.h" #include -BOOL ov25_02254560(UnkStruct_ov25_02254560 ** param0, const UnkStruct_ov25_02254560_1 * param1, NNSG2dOamManagerInstance * param2, UnkStruct_ov25_0225424C * param3); +BOOL ov25_02254560(UnkStruct_ov25_02254560 ** param0, const UnkStruct_ov25_02254560_1 * param1, NNSG2dOamManagerInstance * param2, PoketchSystem * param3); UnkStruct_ov25_022555E8 * ov25_02254664(void); BGL * ov25_02254674(void); void ov25_022546B8(u32 param0, u32 param1); diff --git a/include/overlay025/poketch_system.h b/include/overlay025/poketch_system.h new file mode 100644 index 0000000000..404a88c38d --- /dev/null +++ b/include/overlay025/poketch_system.h @@ -0,0 +1,85 @@ +#ifndef POKEPLATINUM_OV25_02253CE0_H +#define POKEPLATINUM_OV25_02253CE0_H + +#include "struct_decls/struct_02018340_decl.h" +#include "field/field_system_decl.h" +#include "poketch_data.h" +#include "savedata.h" +#include "struct_decls/sys_task.h" + +#include "overlay025/struct_ov25_02254560_decl.h" +#include "overlay025/struct_ov25_02254560_1.h" +#include "overlay025/struct_ov25_02255B34_decl.h" + +#include + +enum ButtonDir{ + BUTTON_UP, + BUTTON_DOWN, +}; + +typedef struct PoketchSystem PoketchSystem; + +typedef BOOL (* UnkFuncPtr_ov25_02254238)(void **, PoketchSystem *, BGL *, u32); +typedef void (* UnkFuncPtr_ov25_02254238_1)(void *); +typedef void (* UnkFuncPtr_ov25_02254274)(void *); + +struct PoketchSystem { + u8 unk_00; + u8 unk_01; + u8 unk_02; + u8 unk_03; + u8 unk_04; + u8 unk_05; + u8 unk_06; + u8 pedometerUpdated; + u32 unk_08; + BOOL unk_0C; + u32 unk_10; + enum PoketchAppID loadedAppID; + FSOverlayID loadedAppOverlayID; + UnkStruct_ov25_02254560 * unk_1C; + UnkStruct_ov25_02254560_1 unk_20; + void * unk_24; + UnkStruct_ov25_02255B34 * unk_28; + u32 unk_2C; + u32 unk_30; + PoketchSystem ** poketchSysPtr; + SysTask * unk_38; + UnkFuncPtr_ov25_02254238 unk_3C; + UnkFuncPtr_ov25_02254238_1 unk_40; + UnkFuncPtr_ov25_02254274 unk_44; + void * unk_48; + BGL *bgl; + NNSG2dOamManagerInstance * unk_50; + SaveData * saveData; + PoketchData * poketchData; + FieldSystem * fieldSys; + enum ButtonDir buttonDir; +}; + +void PoketchSystem_Create(FieldSystem *fieldSys, PoketchSystem **poketchSys, SaveData *saveData, BGL *bgl, NNSG2dOamManagerInstance *oamManager); +void ov25_02253D5C(PoketchSystem *poketchSys); +BOOL ov25_02253D70(PoketchSystem *poketchSys); +void ov25_02253D7C(PoketchSystem *poketchSys, int param1, u32 param2); +BOOL ov25_02253DD4(PoketchSystem *poketchSys); +enum PoketchAppID PoketchSystem_CurrentAppID(PoketchSystem *poketchSys); +void ov25_02254238(UnkFuncPtr_ov25_02254238 param0, UnkFuncPtr_ov25_02254238_1 param1); +void ov25_0225424C(PoketchSystem *poketchSys); +void ov25_02254260(PoketchSystem *poketchSys); +void ov25_02254274(UnkFuncPtr_ov25_02254274 param0, void * param1); +UnkStruct_ov25_02254560 * ov25_02254418(void); +void ov25_02254424(u32 param0); +void ov25_02254444(u32 param0, u32 param1); +BOOL ov25_0225446C(u32 * param0, u32 * param1); +BOOL ov25_022544BC(u32 * param0, u32 * param1); +BOOL ov25_0225450C(const PoketchSystem *poketchSys); +void ov25_02254518(const PoketchSystem *poketchSys, UnkStruct_ov25_02255B34 * param1); +BOOL ov25_02254534(const PoketchSystem *poketchSys); +BOOL PoketchSystem_PedometerUpdated(const PoketchSystem *poketchSys); +FieldSystem * PoketchSystem_FieldSystem(const PoketchSystem *poketchSys); +PoketchData * PoketchSystem_PoketchData(const PoketchSystem *poketchSys); +SaveData * PoketchSystem_SaveData(const PoketchSystem *poketchSys); +int ov25_02254548(const PoketchSystem *poketchSys); + +#endif // POKEPLATINUM_OV25_02253CE0_H diff --git a/include/overlay025/struct_ov25_02253CE0_decl.h b/include/overlay025/struct_ov25_02253CE0_decl.h deleted file mode 100644 index 69b47819d1..0000000000 --- a/include/overlay025/struct_ov25_02253CE0_decl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_OV25_02253CE0_DECL_H -#define POKEPLATINUM_STRUCT_OV25_02253CE0_DECL_H - -typedef struct UnkStruct_ov25_02253CE0_t UnkStruct_ov25_02253CE0; - -#endif // POKEPLATINUM_STRUCT_OV25_02253CE0_DECL_H diff --git a/include/overlay025/struct_ov25_0225424C_decl.h b/include/overlay025/struct_ov25_0225424C_decl.h deleted file mode 100644 index bf9aa8f3cd..0000000000 --- a/include/overlay025/struct_ov25_0225424C_decl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_OV25_0225424C_DECL_H -#define POKEPLATINUM_STRUCT_OV25_0225424C_DECL_H - -typedef struct UnkStruct_ov25_02253CE0_t UnkStruct_ov25_0225424C; - -#endif // POKEPLATINUM_STRUCT_OV25_0225424C_DECL_H diff --git a/include/overlay036/ov36_02256404.h b/include/overlay036/poketch_app_pedometer.h similarity index 55% rename from include/overlay036/ov36_02256404.h rename to include/overlay036/poketch_app_pedometer.h index 6a2d852b2e..eb1ee0db60 100644 --- a/include/overlay036/ov36_02256404.h +++ b/include/overlay036/poketch_app_pedometer.h @@ -1,9 +1,12 @@ -#ifndef POKEPLATINUM_OV36_02256404_H -#define POKEPLATINUM_OV36_02256404_H +#ifndef POKEPLATINUM_POKETCH_APP_PEDOMETER_H +#define POKEPLATINUM_POKETCH_APP_PEDOMETER_H -#include "struct_decls/struct_02018340_decl.h" -#include "overlay036/struct_ov36_02256404_1.h" -#include "overlay036/struct_ov36_02256404_decl.h" +typedef struct { + u32 unk_00; + u32 unk_04; +} UnkStruct_ov36_02256404_1; + +typedef struct UnkStruct_ov36_02256404_t UnkStruct_ov36_02256404; BOOL ov36_02256404(UnkStruct_ov36_02256404 ** param0, const UnkStruct_ov36_02256404_1 * param1, BGL * param2); void ov36_02256440(UnkStruct_ov36_02256404 * param0); @@ -11,4 +14,4 @@ void ov36_0225653C(UnkStruct_ov36_02256404 * param0, u32 param1); BOOL ov36_02256560(UnkStruct_ov36_02256404 * param0, u32 param1); BOOL ov36_0225656C(UnkStruct_ov36_02256404 * param0); -#endif // POKEPLATINUM_OV36_02256404_H +#endif // POKEPLATINUM_POKETCH_APP_PEDOMETER_H diff --git a/include/overlay036/struct_ov36_02256404_1.h b/include/overlay036/struct_ov36_02256404_1.h deleted file mode 100644 index 307188c64e..0000000000 --- a/include/overlay036/struct_ov36_02256404_1.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_OV36_02256404_1_H -#define POKEPLATINUM_STRUCT_OV36_02256404_1_H - -typedef struct { - u32 unk_00; - u32 unk_04; -} UnkStruct_ov36_02256404_1; - -#endif // POKEPLATINUM_STRUCT_OV36_02256404_1_H diff --git a/include/overlay036/struct_ov36_02256404_decl.h b/include/overlay036/struct_ov36_02256404_decl.h deleted file mode 100644 index c72de47941..0000000000 --- a/include/overlay036/struct_ov36_02256404_decl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_OV36_02256404_DECL_H -#define POKEPLATINUM_STRUCT_OV36_02256404_DECL_H - -typedef struct UnkStruct_ov36_02256404_t UnkStruct_ov36_02256404; - -#endif // POKEPLATINUM_STRUCT_OV36_02256404_DECL_H diff --git a/include/poketch_data.h b/include/poketch_data.h index 4eff11e69f..11d605372b 100644 --- a/include/poketch_data.h +++ b/include/poketch_data.h @@ -37,7 +37,9 @@ enum PoketchAppID { POKETCH_APPID_STOPWATCH, // unused POKETCH_APPID_ALARMCLOCK, // unused - POKETCH_APPID_MAX + POKETCH_APPID_MAX, + + POKETCH_APPID_NONE = -1 }; /** Poketch Screen colors, used in PoketchData_SetScreenColor */ diff --git a/include/unk_0203CC84.h b/include/unk_0203CC84.h index 1671322a1e..4e8d77d0db 100644 --- a/include/unk_0203CC84.h +++ b/include/unk_0203CC84.h @@ -5,7 +5,7 @@ #include "field/field_system_decl.h" #include "overlay_manager.h" #include "savedata.h" -#include "overlay025/struct_ov25_02253CE0_decl.h" +#include "overlay025/poketch_system.h" void sub_0203CD00(FieldSystem * param0); void sub_0203CD44(FieldSystem * param0); @@ -15,7 +15,7 @@ BOOL sub_0203CD74(FieldSystem * param0); void sub_0203CD84(FieldSystem * param0, const OverlayManagerTemplate * param1, void * param2); void sub_0203D128(void); void sub_0203D140(void); -UnkStruct_ov25_02253CE0 * sub_0203D158(void); +PoketchSystem * sub_0203D158(void); BGL * sub_0203D170(void * param0); SaveData * FieldSystem_SaveData(void * param0); diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index 1def54ad74..df46bb2ee0 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -871,7 +871,7 @@ Overlay overlay24 Overlay overlay25 { After overlay9 - Object main.nef.p/src_overlay025_ov25_02253CE0.c.o + Object main.nef.p/src_overlay025_poketch_system.c.o Object main.nef.p/src_overlay025_ov25_02254560.c.o Object main.nef.p/src_overlay025_ov25_02255090.c.o Object main.nef.p/src_overlay025_ov25_02255540.c.o diff --git a/src/meson.build b/src/meson.build index 806394a1ba..9ee2603c44 100644 --- a/src/meson.build +++ b/src/meson.build @@ -662,7 +662,7 @@ pokeplatinum_c = files( 'overlay023/ov23_022542CC.c', 'overlay023/ov23_02254A14.c', 'overlay024/ov24_02253CE0.c', - 'overlay025/ov25_02253CE0.c', + 'overlay025/poketch_system.c', 'overlay025/ov25_02254560.c', 'overlay025/ov25_02255090.c', 'overlay025/ov25_02255540.c', diff --git a/src/overlay005/ov5_021DDAE4.c b/src/overlay005/ov5_021DDAE4.c index 03ec5aeb03..7705bb92c5 100644 --- a/src/overlay005/ov5_021DDAE4.c +++ b/src/overlay005/ov5_021DDAE4.c @@ -14,7 +14,7 @@ #include "poketch_data.h" #include "overlay005/ov5_021DDAE4.h" #include "overlay024/ov24_02253CE0.h" -#include "overlay025/ov25_02253CE0.h" +#include "overlay025/poketch_system.h" FS_EXTERN_OVERLAY(overlay24); FS_EXTERN_OVERLAY(overlay25); @@ -46,7 +46,7 @@ static BOOL ov5_021DDAE4 (UnkStruct_020508D4 * param0) Overlay_UnloadByID(FS_OVERLAY_ID(overlay24)); Overlay_LoadByID(FS_OVERLAY_ID(overlay25), 2); PoketchData_Enable(v2); - ov25_02253CE8(v0, &v0->unk_04->unk_14, v0->unk_0C, v0->unk_08, sub_0200A914(1)); + PoketchSystem_Create(v0, &v0->unk_04->unk_14, v0->unk_0C, v0->unk_08, sub_0200A914(1)); v1->unk_00++; } break; diff --git a/src/overlay005/ov5_021EA714.c b/src/overlay005/ov5_021EA714.c index 48fe675263..001aa18ff8 100644 --- a/src/overlay005/ov5_021EA714.c +++ b/src/overlay005/ov5_021EA714.c @@ -13,7 +13,7 @@ #include "unk_0206A8DC.h" #include "overlay005/ov5_021EA714.h" #include "overlay024/ov24_02253CE0.h" -#include "overlay025/ov25_02253CE0.h" +#include "overlay025/poketch_system.h" FS_EXTERN_OVERLAY(overlay24); FS_EXTERN_OVERLAY(overlay25); @@ -34,7 +34,7 @@ void ov5_021EA728 (FieldSystem * param0) if (PoketchData_IsEnabled(v0) && (sub_0206AE2C(v1) == 0)) { Overlay_LoadByID(FS_OVERLAY_ID(overlay25), 2); - ov25_02253CE8(param0, ¶m0->unk_04->unk_14, param0->unk_0C, param0->unk_08, sub_0200A914(1)); + PoketchSystem_Create(param0, ¶m0->unk_04->unk_14, param0->unk_0C, param0->unk_08, sub_0200A914(1)); } else { Overlay_LoadByID(FS_OVERLAY_ID(overlay24), 2); ov24_02253CE0(param0->unk_08); diff --git a/src/overlay024/ov24_02253CE0.c b/src/overlay024/ov24_02253CE0.c index 405d8f5740..eea46ba036 100644 --- a/src/overlay024/ov24_02253CE0.c +++ b/src/overlay024/ov24_02253CE0.c @@ -30,7 +30,7 @@ void ov24_02253CE0 (BGL * param0) 0 }; - Heap_Create(3, 8, 0x18000); + Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_POKETCH_APP, 0x18000); GXS_SetGraphicsMode(GX_BGMODE_0); #ifdef SDK_ARM9 diff --git a/src/overlay025/ov25_02253CE0.c b/src/overlay025/ov25_02253CE0.c deleted file mode 100644 index 1e83e729a1..0000000000 --- a/src/overlay025/ov25_02253CE0.c +++ /dev/null @@ -1,833 +0,0 @@ -#include "enums.h" - -#include -#include - -#include "inlines.h" - -#include "struct_decls/struct_02018340_decl.h" -#include "struct_decls/sys_task.h" -#include "trainer_info.h" -#include "field/field_system_decl.h" -#include "savedata.h" -#include "overlay025/struct_ov25_0225424C_decl.h" -#include "overlay025/struct_ov25_02254560_decl.h" -#include "overlay025/struct_ov25_02255B34_decl.h" - -#include "struct_defs/union_02022594_020225E0.h" -#include "overlay025/funcptr_ov25_02254238.h" -#include "overlay025/funcptr_ov25_02254238_1.h" -#include "overlay025/funcptr_ov25_02254274.h" -#include "overlay025/struct_ov25_02254560_1.h" - -#include "unk_02005474.h" -#include "game_overlay.h" -#include "unk_0200D9E8.h" -#include "heap.h" -#include "unk_0201E3D8.h" -#include "unk_02022594.h" -#include "unk_02025E08.h" -#include "trainer_info.h" -#include "unk_020508D4.h" -#include "poketch_data.h" -#include "unk_02099D44.h" -#include "overlay025/ov25_02253CE0.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255ACC.h" - -FS_EXTERN_OVERLAY(overlay26); -FS_EXTERN_OVERLAY(overlay27); -FS_EXTERN_OVERLAY(overlay28); -FS_EXTERN_OVERLAY(overlay29); -FS_EXTERN_OVERLAY(overlay30); -FS_EXTERN_OVERLAY(overlay31); -FS_EXTERN_OVERLAY(overlay32); -FS_EXTERN_OVERLAY(overlay33); -FS_EXTERN_OVERLAY(overlay34); -FS_EXTERN_OVERLAY(overlay35); -FS_EXTERN_OVERLAY(overlay36); -FS_EXTERN_OVERLAY(overlay37); -FS_EXTERN_OVERLAY(overlay38); -FS_EXTERN_OVERLAY(overlay39); -FS_EXTERN_OVERLAY(overlay40); -FS_EXTERN_OVERLAY(overlay41); -FS_EXTERN_OVERLAY(overlay42); -FS_EXTERN_OVERLAY(overlay43); -FS_EXTERN_OVERLAY(overlay44); -FS_EXTERN_OVERLAY(overlay45); -FS_EXTERN_OVERLAY(overlay46); -FS_EXTERN_OVERLAY(overlay47); -FS_EXTERN_OVERLAY(overlay48); -FS_EXTERN_OVERLAY(overlay49); -FS_EXTERN_OVERLAY(overlay50); -FS_EXTERN_OVERLAY(overlay52); -FS_EXTERN_OVERLAY(overlay53); -FS_EXTERN_OVERLAY(overlay54); -FS_EXTERN_OVERLAY(overlay55); - -enum { - UnkEnum_ov25_022542E4_00, - UnkEnum_ov25_022542E4_01, -}; - -typedef struct UnkStruct_ov25_02253CE0_t { - u8 unk_00; - u8 unk_01; - u8 unk_02; - u8 unk_03; - u8 unk_04; - u8 unk_05; - u8 unk_06; - u8 unk_07; - u32 unk_08; - BOOL unk_0C; - u32 unk_10; - int unk_14; - FSOverlayID unk_18; - UnkStruct_ov25_02254560 * unk_1C; - UnkStruct_ov25_02254560_1 unk_20; - void * unk_24; - UnkStruct_ov25_02255B34 * unk_28; - u32 unk_2C; - u32 unk_30; - struct UnkStruct_ov25_02253CE0_t ** unk_34; - SysTask * unk_38; - UnkFuncPtr_ov25_02254238 unk_3C; - UnkFuncPtr_ov25_02254238_1 unk_40; - UnkFuncPtr_ov25_02254274 unk_44; - void * unk_48; - BGL * unk_4C; - NNSG2dOamManagerInstance * unk_50; - SaveData * unk_54; - PoketchData * unk_58; - FieldSystem * unk_5C; - int unk_60; -} UnkStruct_ov25_02253CE0; - -static UnkStruct_ov25_02253CE0 * ov25_02253CE0(void); -static BOOL ov25_02253DDC(UnkStruct_ov25_02253CE0 * param0); -static void ov25_02253E20(UnkStruct_ov25_02253CE0 * param0); -static void ov25_02253E40(SysTask * param0, void * param1); -static void ov25_02253E94(SysTask * param0, void * param1); -static void ov25_02253E9C(UnkStruct_ov25_02253CE0 * param0, u32 param1); -static void ov25_02253EA4(UnkStruct_ov25_02253CE0 * param0); -static void ov25_02253F2C(UnkStruct_ov25_02253CE0 * param0); -static void ov25_0225406C(UnkStruct_ov25_02253CE0 * param0); -static void ov25_022540D8(UnkStruct_ov25_02253CE0 * param0); -static void ov25_02254170(UnkStruct_ov25_02253CE0 * param0, int param1); -static void ov25_022541BC(UnkStruct_ov25_02253CE0 * param0); -static void ov25_022541D8(UnkStruct_ov25_02253CE0 * param0, u32 param1); -static BOOL ov25_022541FC(UnkStruct_ov25_02253CE0 * param0); -static void ov25_0225420C(UnkStruct_ov25_02253CE0 * param0); -static BOOL ov25_02254228(UnkStruct_ov25_02253CE0 * param0); -static BOOL ov25_02254284(UnkStruct_ov25_02253CE0 * param0); -static void ov25_022542C8(UnkStruct_ov25_02253CE0 * param0); -static void ov25_022542D4(UnkStruct_ov25_02253CE0 * param0); -static void ov25_022542E4(u32 param0, u32 param1, u32 param2, void * param3); -static BOOL ov25_022543EC(UnkStruct_ov25_02254560 * param0, u32 param1); -static inline BOOL inline_ov25_0225446C(u32 param0, u32 param1); -struct UnkStruct_ov25_02253CE0_t * sub_0203D158(void); - -static const struct { - int unk_00; - FSOverlayID unk_04; -} Unk_ov25_02255E7C[] = { - {0x0, FS_OVERLAY_ID(overlay26)}, - {0x17, FS_OVERLAY_ID(overlay27)}, - {0x1, FS_OVERLAY_ID(overlay28)}, - {0x2, FS_OVERLAY_ID(overlay29)}, - {0xB, FS_OVERLAY_ID(overlay30)}, - {0x11, FS_OVERLAY_ID(overlay31)}, - {0x4, FS_OVERLAY_ID(overlay32)}, - {0x5, FS_OVERLAY_ID(overlay33)}, - {0x6, FS_OVERLAY_ID(overlay34)}, - {0xA, FS_OVERLAY_ID(overlay35)}, - {0x3, FS_OVERLAY_ID(overlay36)}, - {0x8, FS_OVERLAY_ID(overlay40)}, - {0x12, FS_OVERLAY_ID(overlay41)}, - {0xE, FS_OVERLAY_ID(overlay42)}, - {0xF, FS_OVERLAY_ID(overlay43)}, - {0x16, FS_OVERLAY_ID(overlay44)}, - {0x18, FS_OVERLAY_ID(overlay45)}, - {0x14, FS_OVERLAY_ID(overlay46)}, - {0xC, FS_OVERLAY_ID(overlay47)}, - {0x7, FS_OVERLAY_ID(overlay48)}, - {0x15, FS_OVERLAY_ID(overlay49)}, - {0x10, FS_OVERLAY_ID(overlay50)}, - {0xD, FS_OVERLAY_ID(overlay52)}, - {0x13, FS_OVERLAY_ID(overlay53)}, - {0x9, FS_OVERLAY_ID(overlay54)} -}; - -static UnkStruct_ov25_02253CE0 * ov25_02253CE0 (void) -{ - return sub_0203D158(); -} - -void ov25_02253CE8 (FieldSystem * param0, UnkStruct_ov25_02253CE0 ** param1, SaveData * param2, BGL * param3, NNSG2dOamManagerInstance * param4) -{ - UnkStruct_ov25_02253CE0 * v0; - - Heap_Create(3, 7, 49152); - Heap_Create(3, 8, 49152); - - v0 = Heap_AllocFromHeap(7, sizeof(UnkStruct_ov25_02253CE0)); - - if (v0 != NULL) { - *param1 = v0; - - v0->unk_5C = param0; - v0->unk_54 = param2; - v0->unk_58 = SaveData_PoketchData(param2); - v0->unk_4C = param3; - v0->unk_50 = param4; - - if (ov25_02253DDC(v0)) { - sub_0201E3D8(); - sub_0201E450(4); - - v0->unk_34 = param1; - v0->unk_38 = SysTask_Start(ov25_02253E94, v0, 4); - - SysTask_Start(ov25_02253E40, v0, 0); - } - } -} - -void ov25_02253D5C (UnkStruct_ov25_02253CE0 * param0) -{ - if ((param0->unk_00 != 3) && (param0->unk_00 != 4)) { - ov25_02253E9C(param0, 3); - } -} - -BOOL ov25_02253D70 (UnkStruct_ov25_02253CE0 * param0) -{ - return param0 == NULL; -} - -void ov25_02253D7C (UnkStruct_ov25_02253CE0 * param0, int param1, u32 param2) -{ - switch (param1) { - case 0: - break; - case 1: - param0->unk_04 = 1; - break; - case 5: - { - u32 v0 = PoketchData_StepCount(param0->unk_58); - - if (++v0 > 99999) { - v0 = 0; - } - - PoketchData_SetStepCount(param0->unk_58, v0); - param0->unk_07 = 1; - } - break; - case 4: - if (param0->unk_02 == 2) { - if (param0->unk_44) { - param0->unk_44(param0->unk_48); - } - } - break; - } -} - -BOOL ov25_02253DD4 (UnkStruct_ov25_02253CE0 * param0) -{ - return param0->unk_03; -} - -int ov25_02253DD8 (UnkStruct_ov25_02253CE0 * param0) -{ - return param0->unk_14; -} - -static BOOL ov25_02253DDC (UnkStruct_ov25_02253CE0 * param0) -{ - if (ov25_02254560(&(param0->unk_1C), &(param0->unk_20), param0->unk_50, param0)) { - param0->unk_00 = 0; - param0->unk_01 = 0; - param0->unk_03 = 0; - param0->unk_04 = 0; - param0->unk_07 = 0; - param0->unk_05 = 0; - param0->unk_06 = 0; - param0->unk_14 = -1; - param0->unk_02 = 0; - param0->unk_08 = 0; - param0->unk_60 = UnkEnum_ov25_022542E4_00; - - if (ov25_02254284(param0)) { - return 1; - } - } - - return 0; -} - -static void ov25_02253E20 (UnkStruct_ov25_02253CE0 * param0) -{ - SysTask_Done(param0->unk_38); - - ov25_022542C8(param0); - ov25_022541BC(param0); - ov25_02254754(param0->unk_1C); -} - -static void ov25_02253E40 (SysTask * param0, void * param1) -{ - static void(*const v0[])(UnkStruct_ov25_02253CE0 *) = { - ov25_02253EA4, - ov25_02253F2C, - ov25_0225406C, - ov25_022540D8 - }; - - UnkStruct_ov25_02253CE0 * v1; - - v1 = (UnkStruct_ov25_02253CE0 *)param1; - - if (v1->unk_00 < NELEMS(v0)) { - if (v1->unk_00 != 0) { - ov25_022542D4(v1); - } - - v0[v1->unk_00](v1); - } else { - GF_ASSERT(v1->unk_00 == 4); - *(v1->unk_34) = NULL; - - ov25_02253E20(v1); - Heap_FreeToHeap(v1); - SysTask_Done(param0); - Heap_Destroy(7); - Heap_Destroy(8); - } -} - -static void ov25_02253E94 (SysTask * param0, void * param1) -{ - UnkStruct_ov25_02253CE0 * v0 = param1; - - v0->unk_04 = 0; - v0->unk_07 = 0; -} - -static void ov25_02253E9C (UnkStruct_ov25_02253CE0 * param0, u32 param1) -{ - param0->unk_00 = param1; - param0->unk_01 = 0; -} - -static void ov25_02253EA4 (UnkStruct_ov25_02253CE0 * param0) -{ - switch (param0->unk_01) { - case 0: - ov25_022547D0(param0->unk_1C, 0); - param0->unk_01++; - break; - case 1: - if (ov25_022547F4(param0->unk_1C, 0)) { - u32 v0 = PoketchData_CurrentAppID(param0->unk_58); - - ov25_02254170(param0, v0); - ov25_022541D8(param0, v0); - - param0->unk_01++; - } - break; - case 2: - if (ov25_022541FC(param0) == 0) { - break; - } - - ov25_022547D0(param0->unk_1C, 1); - param0->unk_01++; - case 3: - if (ov25_022547F4(param0->unk_1C, 1)) { - ov25_02253E9C(param0, 1); - } - } -} - -static void ov25_02253F2C (UnkStruct_ov25_02253CE0 * param0) -{ - switch (param0->unk_01) { - case 0: - if (ov25_0225450C(param0)) { - return; - } - - switch (param0->unk_08) { - case 3: - case 5: - param0->unk_0C = 0; - param0->unk_05 = 1; - ov25_022547D0(param0->unk_1C, 4); - param0->unk_01++; - break; - } - break; - case 1: - if ((param0->unk_08 == 3) || (param0->unk_08 == 5)) { - param0->unk_0C = 1; - } - - if (ov25_02254800(param0->unk_1C)) { - if (param0->unk_60 == UnkEnum_ov25_022542E4_00) { - param0->unk_20.unk_00 = PoketchData_DecrementAppID(param0->unk_58); - } else { - param0->unk_20.unk_00 = PoketchData_IncrementAppID(param0->unk_58); - } - - if (param0->unk_0C) { - ov25_022547D0(param0->unk_1C, 12); - param0->unk_10 = 30; - param0->unk_0C = 0; - param0->unk_01 = 4; - } else { - param0->unk_10 = 3; - param0->unk_01 = 2; - } - } - break; - case 2: - if ((param0->unk_08 == 3) || (param0->unk_08 == 5)) { - ov25_022547D0(param0->unk_1C, 12); - param0->unk_10 = 30; - param0->unk_0C = 0; - param0->unk_01 = 4; - break; - } - - if (param0->unk_10) { - param0->unk_10--; - } else { - ov25_0225420C(param0); - param0->unk_01 = 3; - } - break; - case 3: - if (ov25_02254228(param0)) { - ov25_022541BC(param0); - sub_02099D44(); - ov25_02253E9C(param0, 2); - } - break; - case 4: - if ((param0->unk_08 == 3) || (param0->unk_08 == 5)) { - if (param0->unk_60 == UnkEnum_ov25_022542E4_00) { - param0->unk_20.unk_00 = PoketchData_DecrementAppID(param0->unk_58); - } else { - param0->unk_20.unk_00 = PoketchData_IncrementAppID(param0->unk_58); - } - - param0->unk_10 = 30; - ov25_022547D0(param0->unk_1C, 13); - break; - } - - if (param0->unk_10) { - param0->unk_10--; - } else { - ov25_022547D0(param0->unk_1C, 14); - ov25_0225420C(param0); - param0->unk_01 = 3; - } - break; - } -} - -static void ov25_0225406C (UnkStruct_ov25_02253CE0 * param0) -{ - switch (param0->unk_01) { - case 0: - { - u32 v0; - - param0->unk_06 = 1; - v0 = PoketchData_CurrentAppID(param0->unk_58); - - ov25_02254170(param0, v0); - ov25_022541D8(param0, v0); - - param0->unk_01++; - } - break; - case 1: - if (ov25_022541FC(param0)) { - ov25_022547D0(param0->unk_1C, 2); - param0->unk_01++; - } - break; - case 2: - if (ov25_022547F4(param0->unk_1C, 2)) { - param0->unk_05 = 0; - param0->unk_06 = 0; - ov25_02253E9C(param0, 1); - } - break; - } -} - -static void ov25_022540D8 (UnkStruct_ov25_02253CE0 * param0) -{ - switch (param0->unk_01) { - case 0: - switch (param0->unk_02) { - case 1: - param0->unk_01 = 1; - break; - case 2: - ov25_0225420C(param0); - param0->unk_01 = 2; - break; - case 3: - case 0: - param0->unk_01 = 2; - break; - } - break; - case 1: - if (ov25_022541FC(param0)) { - ov25_0225420C(param0); - param0->unk_01 = 2; - } - break; - case 2: - if (ov25_02254228(param0)) { - ov25_022547D0(param0->unk_1C, 17); - param0->unk_01 = 3; - } - break; - case 3: - if (ov25_02254800(param0->unk_1C)) { - ov25_022541BC(param0); - sub_0201E530(); - ov25_02253E9C(param0, 4); - } - break; - } -} - -static void ov25_02254170 (UnkStruct_ov25_02253CE0 * param0, int param1) -{ - GF_ASSERT(param1 >= 0 && param1 < NELEMS(Unk_ov25_02255E7C)); - - if (param0->unk_14 == -1) { - int v0; - - for (v0 = 0; v0 < NELEMS(Unk_ov25_02255E7C); v0++) { - if (Unk_ov25_02255E7C[v0].unk_00 == param1) { - Overlay_LoadByID(Unk_ov25_02255E7C[v0].unk_04, 2); - param0->unk_14 = param1; - param0->unk_18 = Unk_ov25_02255E7C[v0].unk_04; - break; - } - } - } -} - -static void ov25_022541BC (UnkStruct_ov25_02253CE0 * param0) -{ - if (param0->unk_14 != -1) { - Overlay_UnloadByID(param0->unk_18); - param0->unk_14 = -1; - } -} - -static void ov25_022541D8 (UnkStruct_ov25_02253CE0 * param0, u32 param1) -{ - GF_ASSERT(param0->unk_02 == 0); - - param0->unk_3C(&(param0->unk_24), param0, param0->unk_4C, param0->unk_14); - param0->unk_02 = 1; -} - -static BOOL ov25_022541FC (UnkStruct_ov25_02253CE0 * param0) -{ - if (param0->unk_02 == 2) { - return 1; - } - - return 0; -} - -static void ov25_0225420C (UnkStruct_ov25_02253CE0 * param0) -{ - GF_ASSERT(param0->unk_02 == 2); - - param0->unk_40(param0->unk_24); - param0->unk_02 = 3; -} - -static BOOL ov25_02254228 (UnkStruct_ov25_02253CE0 * param0) -{ - if (param0->unk_02 == 0) { - return 1; - } - - return 0; -} - -void ov25_02254238 (UnkFuncPtr_ov25_02254238 param0, UnkFuncPtr_ov25_02254238_1 param1) -{ - UnkStruct_ov25_02253CE0 * v0 = ov25_02253CE0(); - - v0->unk_3C = param0; - v0->unk_40 = param1; - v0->unk_44 = NULL; -} - -void ov25_0225424C (UnkStruct_ov25_0225424C * param0) -{ - GF_ASSERT(param0->unk_02 == 1); - param0->unk_02 = 2; -} - -void ov25_02254260 (UnkStruct_ov25_0225424C * param0) -{ - GF_ASSERT(param0->unk_02 == 3); - param0->unk_02 = 0; -} - -void ov25_02254274 (UnkFuncPtr_ov25_02254274 param0, void * param1) -{ - UnkStruct_ov25_02253CE0 * v0 = ov25_02253CE0(); - - v0->unk_44 = param0; - v0->unk_48 = param1; -} - -static BOOL ov25_02254284 (UnkStruct_ov25_02253CE0 * param0) -{ - static const UnkUnion_020225E0 v0[] = { - {4 * 8, 12 * 8, 28 * 8, 255}, - {12 * 8, 20 * 8, 28 * 8, 255}, - {16, 175, 16, 207} - }; - - param0->unk_28 = ov25_02255ACC(v0, NELEMS(v0), ov25_022542E4, param0, 7); - - if (param0->unk_28 != NULL) { - ov25_02255C48(param0->unk_28, 0, 0, 7); - param0->unk_2C = 0xffffffff; - param0->unk_30 = 0xffffffff; - return 1; - } - - return 0; -} - -static void ov25_022542C8 (UnkStruct_ov25_02253CE0 * param0) -{ - ov25_02255B34(param0->unk_28); -} - -static void ov25_022542D4 (UnkStruct_ov25_02253CE0 * param0) -{ - param0->unk_08 = 0; - ov25_02255B50(param0->unk_28); -} - -static void ov25_022542E4 (u32 param0, u32 param1, u32 param2, void * param3) -{ - UnkStruct_ov25_02253CE0 * v0 = (UnkStruct_ov25_02253CE0 *)param3; - - if (ov25_0225450C(v0) == 0) { - switch (param2) { - case 1: - v0->unk_03 = 1; - break; - case 0: - v0->unk_03 = 0; - break; - } - } else { - v0->unk_03 = 0; - } - - if (param0 == 2) { - if (ov25_0225450C(v0)) { - if (param2 == 1) { - Sound_PlayEffect(1646); - } - } - } else { - u32 v1 = 0xffffffff; - - switch (param2) { - case 0: - v1 = (param0 == 0) ? 8 : 11; - break; - case 1: - if (ov25_0225450C(v0) || v0->unk_06) { - v1 = (param0 == 0) ? 6 : 9; - param1 = 0; - } else { - v1 = (param0 == 0) ? 7 : 10; - } - break; - } - - if (v0->unk_2C != 0xffffffff) { - u32 v2 = v1; - - v1 = v0->unk_2C; - v0->unk_2C = v2; - } - - if (v1 != 0xffffffff) { - if (ov25_022543EC(v0->unk_1C, v1)) { - if ((v1 == 6) || (v1 == 7) || (v1 == 9) || (v1 == 10)) { - v0->unk_30 = v1; - } - } - } - - switch (param1) { - case 5: - ov25_02255C68(v0->unk_28, 0); - break; - case 3: - if ((v0->unk_30 == 6) || (v0->unk_30 == 9)) { - param1 = 0; - } - break; - case 2: - if ((v0->unk_30 == 7) || (v0->unk_30 == 10)) { - param1 = 3; - } - break; - } - - v0->unk_08 = param1; - v0->unk_60 = (param0 == 0) ? UnkEnum_ov25_022542E4_00 : UnkEnum_ov25_022542E4_01; - } -} - -static BOOL ov25_022543EC (UnkStruct_ov25_02254560 * param0, u32 param1) -{ - u32 v0; - - for (v0 = 0; v0 < 6; v0++) { - if (ov25_022547F4(param0, param1) == 0) { - return 0; - } - } - - ov25_022547D0(param0, param1); - - return 1; -} - -UnkStruct_ov25_02254560 * ov25_02254418 (void) -{ - UnkStruct_ov25_02253CE0 * v0 = ov25_02253CE0(); - return v0->unk_1C; -} - -void ov25_02254424 (u32 param0) -{ - UnkStruct_ov25_02253CE0 * v0 = ov25_02253CE0(); - - if ((v0->unk_05 == 0) && (ov25_0225450C(v0) == 0)) { - Sound_PlayEffect(param0); - } -} - -void ov25_02254444 (u32 param0, u32 param1) -{ - UnkStruct_ov25_02253CE0 * v0 = ov25_02253CE0(); - - if ((v0->unk_05 == 0) && (ov25_0225450C(v0) == 0)) { - sub_02005844(param0, param1); - } -} - -static inline BOOL inline_ov25_0225446C (u32 param0, u32 param1) -{ - if (((u32)(param0 - 16) < (u32)(207 - 16)) & ((u32)(param1 - 16) < (u32)(175 - 16))) { - return 1; - } - - return 0; -} - -BOOL ov25_0225446C (u32 * param0, u32 * param1) -{ - UnkStruct_ov25_02253CE0 * v0 = ov25_02253CE0(); - - if ((v0->unk_05 == 0) && (ov25_0225450C(v0) == 0)) { - if (sub_020227A4(param0, param1)) { - return inline_ov25_0225446C(*param0, *param1); - } - } - - return 0; -} - -BOOL ov25_022544BC (u32 * param0, u32 * param1) -{ - UnkStruct_ov25_02253CE0 * v0 = ov25_02253CE0(); - - if ((v0->unk_05 == 0) && (ov25_0225450C(v0) == 0)) { - if (sub_020227C0(param0, param1)) { - return inline_ov25_0225446C(*param0, *param1); - } - } - - return 0; -} - -BOOL ov25_0225450C (const UnkStruct_ov25_0225424C * param0) -{ - return sub_020509A4(param0->unk_5C); -} - -void ov25_02254518 (const UnkStruct_ov25_0225424C * param0, UnkStruct_ov25_02255B34 * param1) -{ - if ((ov25_0225450C(param0) == 0) && (param0->unk_05 == 0)) { - ov25_02255B50(param1); - } -} - -BOOL ov25_02254534 (const UnkStruct_ov25_0225424C * param0) -{ - return param0->unk_04; -} - -BOOL ov25_02254538 (const UnkStruct_ov25_0225424C * param0) -{ - return param0->unk_07; -} - -FieldSystem * ov25_0225453C (const UnkStruct_ov25_0225424C * param0) -{ - return param0->unk_5C; -} - -PoketchData * ov25_02254540 (const UnkStruct_ov25_0225424C * param0) -{ - return (PoketchData *)(param0->unk_58); -} - -SaveData * ov25_02254544 (const UnkStruct_ov25_0225424C * param0) -{ - return (SaveData *)(param0->unk_54); -} - -int ov25_02254548 (const UnkStruct_ov25_0225424C * param0) -{ - TrainerInfo * v0 = SaveData_GetTrainerInfo(param0->unk_54); - - if (TrainerInfo_Gender(v0) == 1) { - return 0; - } else { - return 1; - } -} diff --git a/src/overlay025/ov25_02254560.c b/src/overlay025/ov25_02254560.c index cdaef73bc2..ddbbf73241 100644 --- a/src/overlay025/ov25_02254560.c +++ b/src/overlay025/ov25_02254560.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" #include "poketch_data.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_02254560_decl.h" #include "overlay025/struct_ov25_02255224_decl.h" #include "overlay025/struct_ov25_022555E8_decl.h" @@ -24,7 +24,6 @@ #include "unk_02018340.h" #include "gx_layers.h" #include "poketch_data.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -51,7 +50,7 @@ struct UnkStruct_ov25_02254560_t { SysTask * unk_1D0; UnkStruct_ov25_02254DD8 unk_1D4; BGL * unk_1F8; - UnkStruct_ov25_0225424C * unk_1FC; + PoketchSystem * unk_1FC; u16 unk_200[256]; u16 unk_400[16]; }; @@ -88,12 +87,12 @@ static void ov25_02254F40(UnkStruct_ov25_02254DD8 * param0); static void ov25_02254F68(SysTask * param0, void * param1); static void ov25_02255004(SysTask * param0, void * param1); static void ov25_02255064(SysTask * param0, void * param1); -struct UnkStruct_ov25_02253CE0_t * sub_0203D158(void); +struct PoketchSystem * sub_0203D158(void); SysTask * sub_0200DA3C(SysTaskFunc param0, void * param1, u32 param2); -BOOL ov25_02254560 (UnkStruct_ov25_02254560 ** param0, const UnkStruct_ov25_02254560_1 * param1, NNSG2dOamManagerInstance * param2, UnkStruct_ov25_0225424C * param3) +BOOL ov25_02254560 (UnkStruct_ov25_02254560 ** param0, const UnkStruct_ov25_02254560_1 * param1, NNSG2dOamManagerInstance * param2, PoketchSystem * param3) { - *param0 = Heap_AllocFromHeap(7, sizeof(UnkStruct_ov25_02254560)); + *param0 = Heap_AllocFromHeap(HEAP_ID_POKETCH_MAIN, sizeof(UnkStruct_ov25_02254560)); if (*param0 != NULL) { UnkStruct_ov25_02254560 * v0 = *param0; @@ -167,7 +166,7 @@ static void ov25_02254684 (UnkStruct_ov25_02254560 * param0) void ov25_022546B8 (u32 param0, u32 param1) { UnkStruct_ov25_02254560 * v0 = ov25_02254418(); - PoketchData * v1 = ov25_02254540(v0->unk_1FC); + PoketchData * v1 = PoketchSystem_PoketchData(v0->unk_1FC); u32 v2 = PoketchData_CurrentScreenColor(v1); GXS_LoadBGPltt(&v0->unk_200[v2 * 32], param0 * 0x20, 0x20); @@ -177,7 +176,7 @@ void ov25_022546B8 (u32 param0, u32 param1) void ov25_022546F0 (u32 param0, u32 param1) { UnkStruct_ov25_02254560 * v0 = ov25_02254418(); - PoketchData * v1 = ov25_02254540(v0->unk_1FC); + PoketchData * v1 = PoketchSystem_PoketchData(v0->unk_1FC); u32 v2 = PoketchData_CurrentScreenColor(v1); GXS_LoadBGPltt(&v0->unk_200[v2 * 32 + 16], 0, 0x20); @@ -187,7 +186,7 @@ void ov25_022546F0 (u32 param0, u32 param1) void ov25_02254728 (u16 * param0) { UnkStruct_ov25_02254560 * v0 = ov25_02254418(); - PoketchData * v1 = ov25_02254540(v0->unk_1FC); + PoketchData * v1 = PoketchSystem_PoketchData(v0->unk_1FC); u32 v2 = PoketchData_CurrentScreenColor(v1); MI_CpuCopy16(&v0->unk_200[v2 * 32], param0, 0x20); @@ -609,7 +608,7 @@ static void ov25_02254DE0 (UnkStruct_ov25_02254560 * param0, UnkStruct_ov25_0225 static void ov25_02254E84 (UnkStruct_ov25_02254560 * param0, u32 param1) { - PoketchData * v1 = ov25_02254540(param0->unk_1FC); + PoketchData * v1 = PoketchSystem_PoketchData(param0->unk_1FC); u32 v2 = PoketchData_CurrentScreenColor(v1); ov25_02254728(param0->unk_400); diff --git a/src/overlay025/ov25_02255090.c b/src/overlay025/ov25_02255090.c index 0851f74de2..163c38b268 100644 --- a/src/overlay025/ov25_02255090.c +++ b/src/overlay025/ov25_02255090.c @@ -195,7 +195,7 @@ void ov25_02255290 (u16 * param0, u32 param1) { u16 * v0; - v0 = Heap_AllocFromHeap(8, 0x20); + v0 = Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, 0x20); if (v0) { static const u8 v1[] = { @@ -227,10 +227,10 @@ void ov25_02255308 (u32 param0, u32 param1) { u16 * v0; - v0 = Heap_AllocFromHeap(8, 0x20); + v0 = Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, 0x20); if (v0) { - u16 * v1 = Heap_AllocFromHeap(8, 0x20); + u16 * v1 = Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, 0x20); ov25_02254728(v0); @@ -271,7 +271,7 @@ void ov25_022553A0 (u32 param0, const u32 * param1, u32 param2, BOOL param3) static const u16 v1[2] = {640, 1152}; u8 * v2; - v2 = Heap_AllocFromHeap(8, v1[param3]); + v2 = Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, v1[param3]); if (v2) { NARC * v3 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, 8); diff --git a/src/overlay025/poketch_system.c b/src/overlay025/poketch_system.c new file mode 100644 index 0000000000..b20711ac91 --- /dev/null +++ b/src/overlay025/poketch_system.c @@ -0,0 +1,784 @@ +#include "enums.h" + +#include +#include + +#include "inlines.h" + +#include "struct_decls/struct_02018340_decl.h" +#include "trainer_info.h" +#include "field/field_system_decl.h" +#include "savedata.h" +#include "overlay025/poketch_system.h" +#include "overlay025/struct_ov25_02254560_decl.h" +#include "overlay025/struct_ov25_02255B34_decl.h" + +#include "struct_defs/union_02022594_020225E0.h" + +#include "unk_02005474.h" +#include "game_overlay.h" +#include "unk_0200D9E8.h" +#include "heap.h" +#include "unk_0201E3D8.h" +#include "unk_02022594.h" +#include "unk_02025E08.h" +#include "trainer_info.h" +#include "unk_020508D4.h" +#include "unk_02099D44.h" +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255ACC.h" + +FS_EXTERN_OVERLAY(overlay26); +FS_EXTERN_OVERLAY(overlay27); +FS_EXTERN_OVERLAY(overlay28); +FS_EXTERN_OVERLAY(overlay29); +FS_EXTERN_OVERLAY(overlay30); +FS_EXTERN_OVERLAY(overlay31); +FS_EXTERN_OVERLAY(overlay32); +FS_EXTERN_OVERLAY(overlay33); +FS_EXTERN_OVERLAY(overlay34); +FS_EXTERN_OVERLAY(overlay35); +FS_EXTERN_OVERLAY(overlay36); +FS_EXTERN_OVERLAY(overlay37); +FS_EXTERN_OVERLAY(overlay38); +FS_EXTERN_OVERLAY(overlay39); +FS_EXTERN_OVERLAY(overlay40); +FS_EXTERN_OVERLAY(overlay41); +FS_EXTERN_OVERLAY(overlay42); +FS_EXTERN_OVERLAY(overlay43); +FS_EXTERN_OVERLAY(overlay44); +FS_EXTERN_OVERLAY(overlay45); +FS_EXTERN_OVERLAY(overlay46); +FS_EXTERN_OVERLAY(overlay47); +FS_EXTERN_OVERLAY(overlay48); +FS_EXTERN_OVERLAY(overlay49); +FS_EXTERN_OVERLAY(overlay50); +FS_EXTERN_OVERLAY(overlay52); +FS_EXTERN_OVERLAY(overlay53); +FS_EXTERN_OVERLAY(overlay54); +FS_EXTERN_OVERLAY(overlay55); + +static PoketchSystem * ov25_02253CE0(void); +static BOOL PoketchSystem_InitInternal(PoketchSystem *poketchSys); +static void ov25_02253E20(PoketchSystem *poketchSys); +static void PoketchSystem_MainTask(SysTask *param0, void * param1); +static void ov25_02253E94(SysTask *param0, void * param1); +static void ov25_02253E9C(PoketchSystem *poketchSys, u32 param1); +static void ov25_02253EA4(PoketchSystem *poketchSys); +static void ov25_02253F2C(PoketchSystem *poketchSys); +static void ov25_0225406C(PoketchSystem *poketchSys); +static void ov25_022540D8(PoketchSystem *poketchSys); +static void PoketchSystem_LoadApp(PoketchSystem *poketchSys, int param1); +static void PoketchSystem_UnloadApp(PoketchSystem *poketchSys); +static void ov25_022541D8(PoketchSystem *poketchSys, u32 param1); +static BOOL ov25_022541FC(PoketchSystem *poketchSys); +static void ov25_0225420C(PoketchSystem *poketchSys); +static BOOL ov25_02254228(PoketchSystem *poketchSys); +static BOOL ov25_02254284(PoketchSystem *poketchSys); +static void ov25_022542C8(PoketchSystem *poketchSys); +static void ov25_022542D4(PoketchSystem *poketchSys); +static void ov25_022542E4(u32 param0, u32 param1, u32 param2, void * param3); +static BOOL ov25_022543EC(UnkStruct_ov25_02254560 * param0, u32 param1); +static inline BOOL inline_ov25_0225446C(u32 param0, u32 param1); +struct PoketchSystem * sub_0203D158(void); + +// the order of this array determines the app order in the poketch. +static const struct { + int appID; + FSOverlayID overlayID; +} sAppOverlayIDs[] = { + {POKETCH_APPID_DIGITALWATCH, FS_OVERLAY_ID(overlay26)}, + {POKETCH_APPID_STOPWATCH, FS_OVERLAY_ID(overlay27)}, + {POKETCH_APPID_CALCULATOR, FS_OVERLAY_ID(overlay28)}, + {POKETCH_APPID_MEMOPAD, FS_OVERLAY_ID(overlay29)}, + {POKETCH_APPID_ANALOGWATCH, FS_OVERLAY_ID(overlay30)}, + {POKETCH_APPID_DOTART, FS_OVERLAY_ID(overlay31)}, + {POKETCH_APPID_PARTYSTATUS, FS_OVERLAY_ID(overlay32)}, + {POKETCH_APPID_FRIENDSHIPCHECKER, FS_OVERLAY_ID(overlay33)}, + {POKETCH_APPID_DOWSINGMACHINE, FS_OVERLAY_ID(overlay34)}, + {POKETCH_APPID_COUNTER, FS_OVERLAY_ID(overlay35)}, + {POKETCH_APPID_PEDOMETER, FS_OVERLAY_ID(overlay36)}, + {POKETCH_APPID_DAYCARECHECKER, FS_OVERLAY_ID(overlay40)}, + {POKETCH_APPID_ROULETTE, FS_OVERLAY_ID(overlay41)}, + {POKETCH_APPID_COINTOSS, FS_OVERLAY_ID(overlay42)}, + {POKETCH_APPID_MOVETESTER, FS_OVERLAY_ID(overlay43)}, + {POKETCH_APPID_MATCHUPCHECKER, FS_OVERLAY_ID(overlay44)}, + {POKETCH_APPID_ALARMCLOCK, FS_OVERLAY_ID(overlay45)}, + {POKETCH_APPID_KITCHENTIMER, FS_OVERLAY_ID(overlay46)}, + {POKETCH_APPID_MARKINGMAP, FS_OVERLAY_ID(overlay47)}, + {POKETCH_APPID_BERRYSEARCHER, FS_OVERLAY_ID(overlay48)}, + {POKETCH_APPID_COLORCHANGER, FS_OVERLAY_ID(overlay49)}, + {POKETCH_APPID_CALENDAR, FS_OVERLAY_ID(overlay50)}, + {POKETCH_APPID_LINKSEARCHER, FS_OVERLAY_ID(overlay52)}, + {POKETCH_APPID_RADARCHAINCOUNTER, FS_OVERLAY_ID(overlay53)}, + {POKETCH_APPID_POKEMONHISTORY, FS_OVERLAY_ID(overlay54)} +}; + +static PoketchSystem * ov25_02253CE0 (void) +{ + return sub_0203D158(); +} + + +void PoketchSystem_Create(FieldSystem *fieldSys, PoketchSystem **poketchSys, SaveData *saveData, BGL *bgl, NNSG2dOamManagerInstance *oamManager) +{ + Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_POKETCH_MAIN, HEAP_SIZE_POKETCH_MAIN); + Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_POKETCH_APP, HEAP_SIZE_POKETCH_APP); + + PoketchSystem *new_system = Heap_AllocFromHeap(HEAP_ID_POKETCH_MAIN, sizeof(PoketchSystem)); + + if (new_system != NULL) { + *poketchSys = new_system; + + new_system->fieldSys = fieldSys; + new_system->saveData = saveData; + new_system->poketchData = SaveData_PoketchData(saveData); + new_system->bgl = bgl; + new_system->unk_50 = oamManager; + + if (PoketchSystem_InitInternal(new_system)) { + sub_0201E3D8(); + sub_0201E450(4); + + new_system->poketchSysPtr = poketchSys; + new_system->unk_38 = SysTask_Start(ov25_02253E94, new_system, 4); + + SysTask_Start(PoketchSystem_MainTask, new_system, 0); + } + } +} + +void ov25_02253D5C (PoketchSystem *poketchSys) +{ + if ((poketchSys->unk_00 != 3) && (poketchSys->unk_00 != 4)) { + ov25_02253E9C(poketchSys, 3); + } +} + +BOOL ov25_02253D70 (PoketchSystem *poketchSys) +{ + return poketchSys == NULL; +} + +void ov25_02253D7C (PoketchSystem *poketchSys, int param1, u32 param2) +{ + switch (param1) { + case 0: + break; + case 1: + poketchSys->unk_04 = 1; + break; + case 5:{ + u32 step_count = PoketchData_StepCount(poketchSys->poketchData); + + if (++step_count > 99999) { + step_count = 0; + } + + PoketchData_SetStepCount(poketchSys->poketchData, step_count); + poketchSys->pedometerUpdated = TRUE; + } + break; + case 4: + if (poketchSys->unk_02 == 2) { + if (poketchSys->unk_44) { + poketchSys->unk_44(poketchSys->unk_48); + } + } + break; + } +} + +BOOL ov25_02253DD4 (PoketchSystem *poketchSys) +{ + return poketchSys->unk_03; +} + +enum PoketchAppID PoketchSystem_CurrentAppID(PoketchSystem *poketchSys) +{ + return poketchSys->loadedAppID; +} + +static BOOL PoketchSystem_InitInternal(PoketchSystem *poketchSys) +{ + if (ov25_02254560(&(poketchSys->unk_1C), &(poketchSys->unk_20), poketchSys->unk_50, poketchSys)) { + poketchSys->unk_00 = 0; + poketchSys->unk_01 = 0; + poketchSys->unk_03 = 0; + poketchSys->unk_04 = 0; + poketchSys->pedometerUpdated = FALSE; + poketchSys->unk_05 = 0; + poketchSys->unk_06 = 0; + poketchSys->loadedAppID = POKETCH_APPID_NONE; + poketchSys->unk_02 = 0; + poketchSys->unk_08 = 0; + poketchSys->buttonDir = BUTTON_UP; + + if (ov25_02254284(poketchSys)) { + return TRUE; + } + } + + return FALSE; +} + +static void ov25_02253E20 (PoketchSystem * poketchSys) +{ + SysTask_Done(poketchSys->unk_38); + + ov25_022542C8(poketchSys); + PoketchSystem_UnloadApp(poketchSys); + ov25_02254754(poketchSys->unk_1C); +} + +static void PoketchSystem_MainTask(SysTask *task, void *system) +{ + typedef void(*const PoketchEvent)(PoketchSystem *); + static PoketchEvent sPoketchEvents[] = { + ov25_02253EA4, + ov25_02253F2C, + ov25_0225406C, + ov25_022540D8 + }; + + PoketchSystem *poketchSys = (PoketchSystem *)system; + + if (poketchSys->unk_00 < NELEMS(sPoketchEvents)) { + if (poketchSys->unk_00 != 0) { + ov25_022542D4(poketchSys); + } + + sPoketchEvents[poketchSys->unk_00](poketchSys); + } else { + GF_ASSERT(poketchSys->unk_00 == 4); + *(poketchSys->poketchSysPtr) = NULL; + + ov25_02253E20(poketchSys); + Heap_FreeToHeap(poketchSys); + SysTask_Done(task); + Heap_Destroy(7); + Heap_Destroy(8); + } +} + +static void ov25_02253E94 (SysTask * param0, void * param1) +{ + PoketchSystem * v0 = param1; + + v0->unk_04 = 0; + v0->pedometerUpdated = FALSE; +} + +static void ov25_02253E9C (PoketchSystem *poketchSys, u32 param1) +{ + poketchSys->unk_00 = param1; + poketchSys->unk_01 = 0; +} + +static void ov25_02253EA4 (PoketchSystem *poketchSys) +{ + switch (poketchSys->unk_01) { + case 0: + ov25_022547D0(poketchSys->unk_1C, 0); + poketchSys->unk_01++; + break; + case 1: + if (ov25_022547F4(poketchSys->unk_1C, 0)) { + u32 app_ID = PoketchData_CurrentAppID(poketchSys->poketchData); + + PoketchSystem_LoadApp(poketchSys, app_ID); + ov25_022541D8(poketchSys, app_ID); + + poketchSys->unk_01++; + } + break; + case 2: + if (ov25_022541FC(poketchSys) == 0) { + break; + } + + ov25_022547D0(poketchSys->unk_1C, 1); + poketchSys->unk_01++; + case 3: + if (ov25_022547F4(poketchSys->unk_1C, 1)) { + ov25_02253E9C(poketchSys, 1); + } + } +} + +static void ov25_02253F2C (PoketchSystem *poketchSys) +{ + switch (poketchSys->unk_01) { + case 0: + if (ov25_0225450C(poketchSys)) { + return; + } + + switch (poketchSys->unk_08) { + case 3: + case 5: + poketchSys->unk_0C = 0; + poketchSys->unk_05 = 1; + ov25_022547D0(poketchSys->unk_1C, 4); + poketchSys->unk_01++; + break; + } + break; + case 1: + if ((poketchSys->unk_08 == 3) || (poketchSys->unk_08 == 5)) { + poketchSys->unk_0C = 1; + } + + if (ov25_02254800(poketchSys->unk_1C)) { + if (poketchSys->buttonDir == BUTTON_UP) { + poketchSys->unk_20.unk_00 = PoketchData_DecrementAppID(poketchSys->poketchData); + } else { + poketchSys->unk_20.unk_00 = PoketchData_IncrementAppID(poketchSys->poketchData); + } + + if (poketchSys->unk_0C) { + ov25_022547D0(poketchSys->unk_1C, 12); + poketchSys->unk_10 = 30; + poketchSys->unk_0C = 0; + poketchSys->unk_01 = 4; + } else { + poketchSys->unk_10 = 3; + poketchSys->unk_01 = 2; + } + } + break; + case 2: + if ((poketchSys->unk_08 == 3) || (poketchSys->unk_08 == 5)) { + ov25_022547D0(poketchSys->unk_1C, 12); + poketchSys->unk_10 = 30; + poketchSys->unk_0C = 0; + poketchSys->unk_01 = 4; + break; + } + + if (poketchSys->unk_10) { + poketchSys->unk_10--; + } else { + ov25_0225420C(poketchSys); + poketchSys->unk_01 = 3; + } + break; + case 3: + if (ov25_02254228(poketchSys)) { + PoketchSystem_UnloadApp(poketchSys); + sub_02099D44(); + ov25_02253E9C(poketchSys, 2); + } + break; + case 4: + if ((poketchSys->unk_08 == 3) || (poketchSys->unk_08 == 5)) { + if (poketchSys->buttonDir == BUTTON_UP) { + poketchSys->unk_20.unk_00 = PoketchData_DecrementAppID(poketchSys->poketchData); + } else { + poketchSys->unk_20.unk_00 = PoketchData_IncrementAppID(poketchSys->poketchData); + } + + poketchSys->unk_10 = 30; + ov25_022547D0(poketchSys->unk_1C, 13); + break; + } + + if (poketchSys->unk_10) { + poketchSys->unk_10--; + } else { + ov25_022547D0(poketchSys->unk_1C, 14); + ov25_0225420C(poketchSys); + poketchSys->unk_01 = 3; + } + break; + } +} + +static void ov25_0225406C (PoketchSystem *poketchSys) +{ + switch (poketchSys->unk_01) { + case 0: + { + u32 v0; + + poketchSys->unk_06 = 1; + v0 = PoketchData_CurrentAppID(poketchSys->poketchData); + + PoketchSystem_LoadApp(poketchSys, v0); + ov25_022541D8(poketchSys, v0); + + poketchSys->unk_01++; + } + break; + case 1: + if (ov25_022541FC(poketchSys)) { + ov25_022547D0(poketchSys->unk_1C, 2); + poketchSys->unk_01++; + } + break; + case 2: + if (ov25_022547F4(poketchSys->unk_1C, 2)) { + poketchSys->unk_05 = 0; + poketchSys->unk_06 = 0; + ov25_02253E9C(poketchSys, 1); + } + break; + } +} + +static void ov25_022540D8 (PoketchSystem *poketchSys) +{ + switch (poketchSys->unk_01) { + case 0: + switch (poketchSys->unk_02) { + case 1: + poketchSys->unk_01 = 1; + break; + case 2: + ov25_0225420C(poketchSys); + poketchSys->unk_01 = 2; + break; + case 3: + case 0: + poketchSys->unk_01 = 2; + break; + } + break; + case 1: + if (ov25_022541FC(poketchSys)) { + ov25_0225420C(poketchSys); + poketchSys->unk_01 = 2; + } + break; + case 2: + if (ov25_02254228(poketchSys)) { + ov25_022547D0(poketchSys->unk_1C, 17); + poketchSys->unk_01 = 3; + } + break; + case 3: + if (ov25_02254800(poketchSys->unk_1C)) { + PoketchSystem_UnloadApp(poketchSys); + sub_0201E530(); + ov25_02253E9C(poketchSys, 4); + } + break; + } +} + +static void PoketchSystem_LoadApp(PoketchSystem *poketchSys, int appID) +{ + GF_ASSERT(appID >= 0 && appID < NELEMS(sAppOverlayIDs)); + + if (poketchSys->loadedAppID == POKETCH_APPID_NONE) { + for (int i = 0; i < NELEMS(sAppOverlayIDs); i++) { + if (sAppOverlayIDs[i].appID == appID) { + + Overlay_LoadByID(sAppOverlayIDs[i].overlayID, OVERLAY_LOAD_ASYNC); + poketchSys->loadedAppID = appID; + poketchSys->loadedAppOverlayID = sAppOverlayIDs[i].overlayID; + break; + } + } + } +} + +static void PoketchSystem_UnloadApp(PoketchSystem *poketchSys) +{ + if (poketchSys->loadedAppID != POKETCH_APPID_NONE) { + Overlay_UnloadByID(poketchSys->loadedAppOverlayID); + poketchSys->loadedAppID = POKETCH_APPID_NONE; + } +} + +static void ov25_022541D8 (PoketchSystem *poketchSys, u32 param1) +{ + GF_ASSERT(poketchSys->unk_02 == 0); + + poketchSys->unk_3C(&(poketchSys->unk_24), poketchSys, poketchSys->bgl, poketchSys->loadedAppID); + poketchSys->unk_02 = 1; +} + +static BOOL ov25_022541FC (PoketchSystem *poketchSys) +{ + if (poketchSys->unk_02 == 2) { + return 1; + } + + return 0; +} + +static void ov25_0225420C (PoketchSystem *poketchSys) +{ + GF_ASSERT(poketchSys->unk_02 == 2); + + poketchSys->unk_40(poketchSys->unk_24); + poketchSys->unk_02 = 3; +} + +static BOOL ov25_02254228 (PoketchSystem *poketchSys) +{ + if (poketchSys->unk_02 == 0) { + return TRUE; + } + + return FALSE; +} + +void ov25_02254238 (UnkFuncPtr_ov25_02254238 param0, UnkFuncPtr_ov25_02254238_1 param1) +{ + PoketchSystem * v0 = ov25_02253CE0(); + + v0->unk_3C = param0; + v0->unk_40 = param1; + v0->unk_44 = NULL; +} + +void ov25_0225424C (PoketchSystem *poketchSys) +{ + GF_ASSERT(poketchSys->unk_02 == 1); + poketchSys->unk_02 = 2; +} + +void ov25_02254260 (PoketchSystem *poketchSys) +{ + GF_ASSERT(poketchSys->unk_02 == 3); + poketchSys->unk_02 = 0; +} + +void ov25_02254274 (UnkFuncPtr_ov25_02254274 param0, void * param1) +{ + PoketchSystem * v0 = ov25_02253CE0(); + + v0->unk_44 = param0; + v0->unk_48 = param1; +} + +static BOOL ov25_02254284 (PoketchSystem *poketchSys) +{ + static const UnkUnion_020225E0 v0[] = { + {4 * 8, 12 * 8, 28 * 8, 255}, + {12 * 8, 20 * 8, 28 * 8, 255}, + {16, 175, 16, 207} + }; + + poketchSys->unk_28 = ov25_02255ACC(v0, NELEMS(v0), ov25_022542E4, poketchSys, 7); + + if (poketchSys->unk_28 != NULL) { + ov25_02255C48(poketchSys->unk_28, 0, 0, 7); + poketchSys->unk_2C = 0xffffffff; + poketchSys->unk_30 = 0xffffffff; + return 1; + } + + return 0; +} + +static void ov25_022542C8 (PoketchSystem *poketchSys) +{ + ov25_02255B34(poketchSys->unk_28); +} + +static void ov25_022542D4 (PoketchSystem *poketchSys) +{ + poketchSys->unk_08 = 0; + ov25_02255B50(poketchSys->unk_28); +} + +static void ov25_022542E4 (u32 param0, u32 param1, u32 param2, void * param3) +{ + PoketchSystem * v0 = (PoketchSystem *)param3; + + if (ov25_0225450C(v0) == 0) { + switch (param2) { + case 1: + v0->unk_03 = 1; + break; + case 0: + v0->unk_03 = 0; + break; + } + } else { + v0->unk_03 = 0; + } + + if (param0 == 2) { + if (ov25_0225450C(v0)) { + if (param2 == 1) { + Sound_PlayEffect(1646); + } + } + } else { + u32 v1 = 0xffffffff; + + switch (param2) { + case 0: + v1 = (param0 == 0) ? 8 : 11; + break; + case 1: + if (ov25_0225450C(v0) || v0->unk_06) { + v1 = (param0 == 0) ? 6 : 9; + param1 = 0; + } else { + v1 = (param0 == 0) ? 7 : 10; + } + break; + } + + if (v0->unk_2C != 0xffffffff) { + u32 v2 = v1; + + v1 = v0->unk_2C; + v0->unk_2C = v2; + } + + if (v1 != 0xffffffff) { + if (ov25_022543EC(v0->unk_1C, v1)) { + if ((v1 == 6) || (v1 == 7) || (v1 == 9) || (v1 == 10)) { + v0->unk_30 = v1; + } + } + } + + switch (param1) { + case 5: + ov25_02255C68(v0->unk_28, 0); + break; + case 3: + if ((v0->unk_30 == 6) || (v0->unk_30 == 9)) { + param1 = 0; + } + break; + case 2: + if ((v0->unk_30 == 7) || (v0->unk_30 == 10)) { + param1 = 3; + } + break; + } + + v0->unk_08 = param1; + v0->buttonDir = (param0 == 0) ? BUTTON_UP : BUTTON_DOWN; + } +} + +static BOOL ov25_022543EC (UnkStruct_ov25_02254560 * param0, u32 param1) +{ + u32 v0; + + for (v0 = 0; v0 < 6; v0++) { + if (ov25_022547F4(param0, param1) == 0) { + return 0; + } + } + + ov25_022547D0(param0, param1); + + return 1; +} + +UnkStruct_ov25_02254560 * ov25_02254418 (void) +{ + PoketchSystem * v0 = ov25_02253CE0(); + return v0->unk_1C; +} + +void ov25_02254424 (u32 param0) +{ + PoketchSystem * v0 = ov25_02253CE0(); + + if ((v0->unk_05 == 0) && (ov25_0225450C(v0) == 0)) { + Sound_PlayEffect(param0); + } +} + +void ov25_02254444 (u32 param0, u32 param1) +{ + PoketchSystem * v0 = ov25_02253CE0(); + + if ((v0->unk_05 == 0) && (ov25_0225450C(v0) == 0)) { + sub_02005844(param0, param1); + } +} + +static inline BOOL inline_ov25_0225446C (u32 param0, u32 param1) +{ + if (((u32)(param0 - 16) < (u32)(207 - 16)) & ((u32)(param1 - 16) < (u32)(175 - 16))) { + return 1; + } + + return 0; +} + +BOOL ov25_0225446C (u32 * param0, u32 * param1) +{ + PoketchSystem * v0 = ov25_02253CE0(); + + if ((v0->unk_05 == 0) && (ov25_0225450C(v0) == 0)) { + if (sub_020227A4(param0, param1)) { + return inline_ov25_0225446C(*param0, *param1); + } + } + + return 0; +} + +BOOL ov25_022544BC (u32 * param0, u32 * param1) +{ + PoketchSystem * v0 = ov25_02253CE0(); + + if ((v0->unk_05 == 0) && (ov25_0225450C(v0) == 0)) { + if (sub_020227C0(param0, param1)) { + return inline_ov25_0225446C(*param0, *param1); + } + } + + return 0; +} + +BOOL ov25_0225450C (const PoketchSystem *poketchSys) +{ + return sub_020509A4(poketchSys->fieldSys); +} + +void ov25_02254518 (const PoketchSystem *poketchSys, UnkStruct_ov25_02255B34 * param1) +{ + if ((ov25_0225450C(poketchSys) == 0) && (poketchSys->unk_05 == 0)) { + ov25_02255B50(param1); + } +} + +BOOL ov25_02254534 (const PoketchSystem *poketchSys) +{ + return poketchSys->unk_04; +} + +BOOL PoketchSystem_PedometerUpdated(const PoketchSystem *poketchSys) +{ + return poketchSys->pedometerUpdated; +} + +FieldSystem* PoketchSystem_FieldSystem(const PoketchSystem *poketchSys) +{ + return poketchSys->fieldSys; +} + +PoketchData* PoketchSystem_PoketchData(const PoketchSystem *poketchSys) +{ + return poketchSys->poketchData; +} + +SaveData* PoketchSystem_SaveData(const PoketchSystem *poketchSys) +{ + return poketchSys->saveData; +} + +int ov25_02254548 (const PoketchSystem *poketchSys) +{ + TrainerInfo * v0 = SaveData_GetTrainerInfo(poketchSys->saveData); + + if (TrainerInfo_Gender(v0) == 1) { + return 0; + } else { + return 1; + } +} diff --git a/src/overlay026/ov26_022561C0.c b/src/overlay026/ov26_022561C0.c index aaaebef433..a73e93573c 100644 --- a/src/overlay026/ov26_022561C0.c +++ b/src/overlay026/ov26_022561C0.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_02255B34_decl.h" #include "overlay026/struct_ov26_02256404_decl.h" @@ -14,7 +14,6 @@ #include "unk_0200D9E8.h" #include "rtc.h" #include "heap.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay025/ov25_02255ACC.h" #include "overlay026/ov26_02256404.h" @@ -32,13 +31,13 @@ typedef struct { UnkStruct_ov25_02255B34 * unk_10; UnkStruct_ov26_02256404_1 unk_14; UnkStruct_ov26_02256404 * unk_24; - UnkStruct_ov25_0225424C * unk_28; + PoketchSystem * unk_28; } UnkStruct_ov26_0225621C; static void NitroStaticInit(void); -static BOOL ov26_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); -static BOOL ov26_0225621C(UnkStruct_ov26_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov26_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); +static BOOL ov26_0225621C(UnkStruct_ov26_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov26_022562A4(UnkStruct_ov26_0225621C * param0); static void ov26_022562BC(SysTask * param0, void * param1); static void ov26_022562F8(void * param0); @@ -57,9 +56,9 @@ static void NitroStaticInit (void) ov25_02254238(ov26_022561D4, ov26_022562F8); } -static BOOL ov26_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov26_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov26_0225621C * v0 = (UnkStruct_ov26_0225621C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov26_0225621C)); + UnkStruct_ov26_0225621C * v0 = (UnkStruct_ov26_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov26_0225621C)); if (v0 != NULL) { if (ov26_0225621C(v0, param1, param2, param3)) { @@ -75,7 +74,7 @@ static BOOL ov26_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov26_0225621C (UnkStruct_ov26_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov26_0225621C (UnkStruct_ov26_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { if (ov26_02256404(&(param0->unk_24), &(param0->unk_14), param2)) { param0->unk_00 = 0; diff --git a/src/overlay026/ov26_02256404.c b/src/overlay026/ov26_02256404.c index e4bead1e9f..8816d7282d 100644 --- a/src/overlay026/ov26_02256404.c +++ b/src/overlay026/ov26_02256404.c @@ -34,7 +34,7 @@ static void ov26_022565F4(UnkStruct_ov26_02256404 * param0); BOOL ov26_02256404 (UnkStruct_ov26_02256404 ** param0, const UnkStruct_ov26_02256404_1 * param1, BGL * param2) { - UnkStruct_ov26_02256404 * v0 = (UnkStruct_ov26_02256404 *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov26_02256404)); + UnkStruct_ov26_02256404 * v0 = (UnkStruct_ov26_02256404 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov26_02256404)); if (v0 != NULL) { NNSG2dScreenData * v1; diff --git a/src/overlay027/ov27_022561C0.c b/src/overlay027/ov27_022561C0.c index fedbbcf947..fea92db5e6 100644 --- a/src/overlay027/ov27_022561C0.c +++ b/src/overlay027/ov27_022561C0.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_02255B34_decl.h" #include "overlay027/struct_ov27_0225680C_decl.h" @@ -15,7 +15,6 @@ #include "heap.h" #include "unk_02022844.h" #include "unk_02099D44.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay025/ov25_02255ACC.h" #include "overlay027/ov27_0225680C.h" @@ -43,12 +42,12 @@ typedef struct { UnkStruct_ov27_0225621C_sub1 unk_38; UnkStruct_ov25_02255B34 * unk_5C; UnkStruct_ov27_0225680C * unk_60; - UnkStruct_ov25_0225424C * unk_64; + PoketchSystem * unk_64; } UnkStruct_ov27_0225621C; static void NitroStaticInit(void); -static BOOL ov27_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov27_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); static BOOL ov27_0225621C(UnkStruct_ov27_0225621C * param0, BGL * param1, u32 param2); static void ov27_022562AC(UnkStruct_ov27_0225621C * param0); static void ov27_022562FC(SysTask * param0, void * param1); @@ -73,9 +72,9 @@ static void NitroStaticInit (void) ov25_02254238(ov27_022561D4, ov27_02256358); } -static BOOL ov27_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov27_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov27_0225621C * v0 = (UnkStruct_ov27_0225621C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov27_0225621C)); + UnkStruct_ov27_0225621C * v0 = (UnkStruct_ov27_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov27_0225621C)); if (v0 != NULL) { if (ov27_0225621C(v0, param2, param3)) { diff --git a/src/overlay027/ov27_0225680C.c b/src/overlay027/ov27_0225680C.c index cf78229a9a..a6f247b251 100644 --- a/src/overlay027/ov27_0225680C.c +++ b/src/overlay027/ov27_0225680C.c @@ -19,7 +19,7 @@ #include "heap.h" #include "unk_02018340.h" #include "unk_0201CCF0.h" -#include "overlay025/ov25_02253CE0.h" +#include "overlay025/poketch_system.h" #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -61,11 +61,11 @@ static BOOL ov27_02256E90(UnkStruct_ov27_02256E90 * param0, u32 param1); static void ov27_02256EC4(BGL * param0, u32 param1); static void ov27_02256F24(SysTask * param0, void * param1); static void ov27_02256F7C(UnkStruct_ov27_0225680C * param0); -struct UnkStruct_ov25_02253CE0_t * sub_0203D158(void); +struct PoketchSystem * sub_0203D158(void); BOOL ov27_0225680C (UnkStruct_ov27_0225680C ** param0, const UnkStruct_ov27_0225680C_1 * param1, BGL * param2) { - UnkStruct_ov27_0225680C * v0 = (UnkStruct_ov27_0225680C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov27_0225680C)); + UnkStruct_ov27_0225680C * v0 = (UnkStruct_ov27_0225680C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov27_0225680C)); if (v0 != NULL) { v0->unk_00 = param1; diff --git a/src/overlay028/ov28_022561C0.c b/src/overlay028/ov28_022561C0.c index 6e4061bca0..e2d8790bd8 100644 --- a/src/overlay028/ov28_022561C0.c +++ b/src/overlay028/ov28_022561C0.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" #include "struct_decls/pokedexdata_decl.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_02255B34_decl.h" #include "overlay028/struct_ov28_0225697C_decl.h" #include "overlay028/struct_ov28_02256E9C_decl.h" @@ -18,7 +18,6 @@ #include "heap.h" #include "unk_0202631C.h" #include "pokemon.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay025/ov25_02255ACC.h" #include "overlay028/ov28_0225697C.h" #include "overlay028/ov28_02256E9C.h" @@ -33,14 +32,14 @@ typedef struct { u16 unk_06; u32 unk_08; UnkStruct_ov25_02255B34 * unk_0C; - UnkStruct_ov25_0225424C * unk_10; + PoketchSystem * unk_10; UnkStruct_ov28_0225697C * unk_14; UnkStruct_ov28_0225697C_1 unk_18; } UnkStruct_ov28_02256210; static void NitroStaticInit(void); -static BOOL ov28_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov28_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); static BOOL ov28_02256210(UnkStruct_ov28_02256210 * param0, u32 param1, BGL * param2); static void ov28_02256298(UnkStruct_ov28_02256210 * param0); static void ov28_022562CC(SysTask * param0, void * param1); @@ -83,9 +82,9 @@ static void NitroStaticInit (void) ov25_02254238(ov28_022561D4, ov28_02256324); } -static BOOL ov28_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov28_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov28_02256210 * v0 = (UnkStruct_ov28_02256210 *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov28_02256210)); + UnkStruct_ov28_02256210 * v0 = (UnkStruct_ov28_02256210 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov28_02256210)); if (v0 != NULL) { if (ov28_02256210(v0, param3, param2)) { @@ -636,7 +635,7 @@ static void ov28_02256914 (UnkStruct_ov28_02256210 * param0, const UnkStruct_ov2 PokedexData * v1; u16 v2; - v1 = sub_02027560(ov25_02254544(param0->unk_10)); + v1 = sub_02027560(PoketchSystem_SaveData(param0->unk_10)); if (sub_02027474(v1)) { v2 = v0; diff --git a/src/overlay028/ov28_0225697C.c b/src/overlay028/ov28_0225697C.c index 08b189518f..52d5e7f531 100644 --- a/src/overlay028/ov28_0225697C.c +++ b/src/overlay028/ov28_0225697C.c @@ -13,7 +13,7 @@ #include "unk_02006E3C.h" #include "heap.h" #include "unk_02018340.h" -#include "overlay025/ov25_02253CE0.h" +#include "overlay025/poketch_system.h" #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay028/ov28_0225697C.h" @@ -43,7 +43,7 @@ static void ov28_02256D90(BGL * param0, const UnkStruct_ov28_0225697C_1 * param1 static void ov28_02256DCC(BGL * param0); static void ov28_02256DF0(SysTask * param0, void * param1); static void ov28_02256E0C(BGL * param0, const u16 * param1); -struct UnkStruct_ov25_02253CE0_t * sub_0203D158(void); +struct PoketchSystem * sub_0203D158(void); static const u16 Unk_ov28_022578F8[32] = { 0xFB, @@ -461,7 +461,7 @@ static const struct { BOOL ov28_0225697C (UnkStruct_ov28_0225697C ** param0, const UnkStruct_ov28_0225697C_1 * param1, BGL * param2) { - UnkStruct_ov28_0225697C * v0 = (UnkStruct_ov28_0225697C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov28_0225697C)); + UnkStruct_ov28_0225697C * v0 = (UnkStruct_ov28_0225697C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov28_0225697C)); if (v0 != NULL) { v0->unk_00 = param1; diff --git a/src/overlay028/ov28_02256E9C.c b/src/overlay028/ov28_02256E9C.c index b59f4aa6c4..37b4b84355 100644 --- a/src/overlay028/ov28_02256E9C.c +++ b/src/overlay028/ov28_02256E9C.c @@ -36,7 +36,7 @@ static void ov28_022575EC(const UnkStruct_ov28_02256E9C * param0, const UnkStruc BOOL ov28_02256E9C (UnkStruct_ov28_02256E9C ** param0, u32 param1) { - *param0 = Heap_AllocFromHeap(8, sizeof(UnkStruct_ov28_02256E9C)); + *param0 = Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov28_02256E9C)); if (*param0) { (*param0)->unk_0A = param1; diff --git a/src/overlay029/ov29_022561C0.c b/src/overlay029/ov29_022561C0.c index 85eaa73c33..a604a102a6 100644 --- a/src/overlay029/ov29_022561C0.c +++ b/src/overlay029/ov29_022561C0.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_02255B34_decl.h" #include "overlay029/struct_ov29_022566C8_decl.h" @@ -13,7 +13,6 @@ #include "unk_0200D9E8.h" #include "heap.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay025/ov25_02255ACC.h" #include "overlay029/ov29_022566C8.h" @@ -25,14 +24,14 @@ typedef struct { u32 unk_04; UnkStruct_ov29_022566C8_1 unk_08; UnkStruct_ov29_022566C8 * unk_16F4; - UnkStruct_ov25_0225424C * unk_16F8; + PoketchSystem * unk_16F8; UnkStruct_ov25_02255B34 * unk_16FC; } UnkStruct_ov29_0225621C; static void NitroStaticInit(void); -static BOOL ov29_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); -static BOOL ov29_0225621C(UnkStruct_ov29_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov29_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); +static BOOL ov29_0225621C(UnkStruct_ov29_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov29_02256288(UnkStruct_ov29_0225621C * param0); static void ov29_022562AC(SysTask * param0, void * param1); static void ov29_022562F4(u32 param0, u32 param1, u32 param2, void * param3); @@ -55,9 +54,9 @@ static void NitroStaticInit (void) ov25_02254238(ov29_022561D4, ov29_02256324); } -static BOOL ov29_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov29_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov29_0225621C * v0 = (UnkStruct_ov29_0225621C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov29_0225621C)); + UnkStruct_ov29_0225621C * v0 = (UnkStruct_ov29_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov29_0225621C)); if (v0 != NULL) { if (ov29_0225621C(v0, param1, param2, param3)) { @@ -73,7 +72,7 @@ static BOOL ov29_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov29_0225621C (UnkStruct_ov29_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov29_0225621C (UnkStruct_ov29_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { memset(param0->unk_08.unk_0C, 0, sizeof(u8) * (78 * 75)); diff --git a/src/overlay029/ov29_022566C8.c b/src/overlay029/ov29_022566C8.c index 7be7b5a97b..9d5ce5126e 100644 --- a/src/overlay029/ov29_022566C8.c +++ b/src/overlay029/ov29_022566C8.c @@ -20,7 +20,7 @@ #include "heap.h" #include "unk_02018340.h" #include "unk_02099D44.h" -#include "overlay025/ov25_02253CE0.h" +#include "overlay025/poketch_system.h" #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -49,7 +49,7 @@ static void ov29_02256B18(UnkStruct_ov29_022566C8 * param0); BOOL ov29_022566C8 (UnkStruct_ov29_022566C8 ** param0, const UnkStruct_ov29_022566C8_1 * param1, BGL * param2) { - UnkStruct_ov29_022566C8 * v0 = (UnkStruct_ov29_022566C8 *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov29_022566C8)); + UnkStruct_ov29_022566C8 * v0 = (UnkStruct_ov29_022566C8 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov29_022566C8)); if (v0 != NULL) { GF_ASSERT(GF_heap_c_dummy_return_true(7)); diff --git a/src/overlay030/ov30_022561C0.c b/src/overlay030/ov30_022561C0.c index 2b60bd750f..2e77984fc6 100644 --- a/src/overlay030/ov30_022561C0.c +++ b/src/overlay030/ov30_022561C0.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_02255B34_decl.h" #include "overlay030/struct_ov30_022563EC_decl.h" @@ -14,7 +14,6 @@ #include "unk_0200D9E8.h" #include "rtc.h" #include "heap.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay025/ov25_02255ACC.h" #include "overlay030/ov30_022563EC.h" @@ -31,13 +30,13 @@ typedef struct { UnkStruct_ov25_02255B34 * unk_10; UnkStruct_ov30_022563EC_1 unk_14; UnkStruct_ov30_022563EC * unk_24; - UnkStruct_ov25_0225424C * unk_28; + PoketchSystem * unk_28; } UnkStruct_ov30_0225621C; static void NitroStaticInit(void); -static BOOL ov30_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); -static BOOL ov30_0225621C(UnkStruct_ov30_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov30_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); +static BOOL ov30_0225621C(UnkStruct_ov30_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov30_02256298(UnkStruct_ov30_0225621C * param0); static void ov30_022562B0(SysTask * param0, void * param1); static void ov30_022562EC(void * param0); @@ -56,9 +55,9 @@ static void NitroStaticInit (void) ov25_02254238(ov30_022561D4, ov30_022562EC); } -static BOOL ov30_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov30_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov30_0225621C * v0 = (UnkStruct_ov30_0225621C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov30_0225621C)); + UnkStruct_ov30_0225621C * v0 = (UnkStruct_ov30_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov30_0225621C)); if (v0 != NULL) { if (ov30_0225621C(v0, param1, param2, param3)) { @@ -74,7 +73,7 @@ static BOOL ov30_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov30_0225621C (UnkStruct_ov30_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov30_0225621C (UnkStruct_ov30_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { if (ov30_022563EC(&(param0->unk_24), &(param0->unk_14), param2)) { param0->unk_00 = 0; diff --git a/src/overlay030/ov30_022563EC.c b/src/overlay030/ov30_022563EC.c index ed03571e91..99d96c8175 100644 --- a/src/overlay030/ov30_022563EC.c +++ b/src/overlay030/ov30_022563EC.c @@ -45,7 +45,7 @@ static void ov30_02256658(UnkStruct_ov30_022563EC * param0); BOOL ov30_022563EC (UnkStruct_ov30_022563EC ** param0, const UnkStruct_ov30_022563EC_1 * param1, BGL * param2) { - UnkStruct_ov30_022563EC * v0 = (UnkStruct_ov30_022563EC *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov30_022563EC)); + UnkStruct_ov30_022563EC * v0 = (UnkStruct_ov30_022563EC *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov30_022563EC)); if (v0 != NULL) { NNSG2dScreenData * v1; diff --git a/src/overlay031/ov31_022561C0.c b/src/overlay031/ov31_022561C0.c index 27a8a81a56..af89a3c676 100644 --- a/src/overlay031/ov31_022561C0.c +++ b/src/overlay031/ov31_022561C0.c @@ -6,7 +6,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay031/struct_ov31_02256554_decl.h" #include "overlay031/struct_ov31_02256554_1.h" @@ -15,7 +15,6 @@ #include "heap.h" #include "unk_02022594.h" #include "poketch_data.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay031/ov31_02256554.h" typedef struct { @@ -26,14 +25,14 @@ typedef struct { u32 unk_08; UnkStruct_ov31_02256554_1 unk_0C; UnkStruct_ov31_02256554 * unk_1EC; - UnkStruct_ov25_0225424C * unk_1F0; + PoketchSystem * unk_1F0; u8 unk_1F4[120]; } UnkStruct_ov31_02256228; static void NitroStaticInit(void); -static BOOL ov31_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); -static BOOL ov31_02256228(UnkStruct_ov31_02256228 * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov31_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); +static BOOL ov31_02256228(UnkStruct_ov31_02256228 * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov31_02256268(UnkStruct_ov31_02256228 * param0, UnkStruct_ov31_02256554_1 * param1); static inline u8 inline_ov31_02256298(const u8 * param0, int param1); static inline void inline_ov31_022562EC(u8 * param0, int param1, int param2); @@ -54,9 +53,9 @@ static void NitroStaticInit (void) ov25_02254238(ov31_022561D4, ov31_02256404); } -static BOOL ov31_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov31_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov31_02256228 * v0 = (UnkStruct_ov31_02256228 *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov31_02256228)); + UnkStruct_ov31_02256228 * v0 = (UnkStruct_ov31_02256228 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov31_02256228)); if (v0 != NULL) { if (ov31_02256228(v0, param1, param2, param3)) { @@ -73,7 +72,7 @@ static BOOL ov31_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov31_02256228 (UnkStruct_ov31_02256228 * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov31_02256228 (UnkStruct_ov31_02256228 * param0, PoketchSystem * param1, BGL * param2, u32 param3) { param0->unk_1F0 = param1; ov31_02256268(param0, &(param0->unk_0C)); @@ -93,7 +92,7 @@ static BOOL ov31_02256228 (UnkStruct_ov31_02256228 * param0, UnkStruct_ov25_0225 static void ov31_02256268 (UnkStruct_ov31_02256228 * param0, UnkStruct_ov31_02256554_1 * param1) { - PoketchData * v0 = ov25_02254540(param0->unk_1F0); + PoketchData * v0 = PoketchSystem_PoketchData(param0->unk_1F0); if (PoketchData_DotArtModified(v0)) { ov31_02256298(param0, param1, v0); @@ -179,7 +178,7 @@ static void ov31_0225635C (UnkStruct_ov31_02256554_1 * param0) static void ov31_02256384 (UnkStruct_ov31_02256228 * param0) { - ov31_022562EC(param0, ¶m0->unk_0C, ov25_02254540(param0->unk_1F0)); + ov31_022562EC(param0, ¶m0->unk_0C, PoketchSystem_PoketchData(param0->unk_1F0)); ov31_02256584(param0->unk_1EC); Heap_FreeToHeap(param0); @@ -188,7 +187,7 @@ static void ov31_02256384 (UnkStruct_ov31_02256228 * param0) static void ov31_022563B0 (void * param0) { UnkStruct_ov31_02256228 * v0 = param0; - ov31_022562EC(v0, &v0->unk_0C, ov25_02254540(v0->unk_1F0)); + ov31_022562EC(v0, &v0->unk_0C, PoketchSystem_PoketchData(v0->unk_1F0)); } static void ov31_022563CC (SysTask * param0, void * param1) diff --git a/src/overlay031/ov31_02256554.c b/src/overlay031/ov31_02256554.c index 907c9f8860..8a055158f1 100644 --- a/src/overlay031/ov31_02256554.c +++ b/src/overlay031/ov31_02256554.c @@ -31,7 +31,7 @@ static void ov31_0225672C(BGL * param0, const UnkStruct_ov31_02256554_1 * param1 BOOL ov31_02256554 (UnkStruct_ov31_02256554 ** param0, const UnkStruct_ov31_02256554_1 * param1, BGL * param2) { - UnkStruct_ov31_02256554 * v0 = (UnkStruct_ov31_02256554 *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov31_02256554)); + UnkStruct_ov31_02256554 * v0 = (UnkStruct_ov31_02256554 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov31_02256554)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 8); @@ -120,7 +120,7 @@ static void ov31_022565E0 (SysTask * param0, void * param1) static void ov31_02256644 (BGL * param0) { - u8 * v0 = Heap_AllocFromHeap(8, 0x20 * 16); + u8 * v0 = Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, 0x20 * 16); if (v0) { int v1; diff --git a/src/overlay032/ov32_022561C0.c b/src/overlay032/ov32_022561C0.c index a8b2b5e2fe..7744d7dd07 100644 --- a/src/overlay032/ov32_022561C0.c +++ b/src/overlay032/ov32_022561C0.c @@ -6,7 +6,7 @@ #include "struct_decls/sys_task.h" #include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay032/struct_ov32_02256470_decl.h" #include "overlay032/struct_ov32_02256470_1.h" @@ -17,7 +17,6 @@ #include "pokemon.h" #include "pokemon_icon.h" #include "party.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay032/ov32_02256470.h" typedef struct { @@ -26,13 +25,13 @@ typedef struct { u8 unk_02; UnkStruct_ov32_02256470_1 unk_04; UnkStruct_ov32_02256470 * unk_74; - UnkStruct_ov25_0225424C * unk_78; + PoketchSystem * unk_78; } UnkStruct_ov32_0225621C; static void NitroStaticInit(void); -static BOOL ov32_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); -static BOOL ov32_0225621C(UnkStruct_ov32_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov32_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); +static BOOL ov32_0225621C(UnkStruct_ov32_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov32_02256264(UnkStruct_ov32_0225621C * param0); static void ov32_02256278(SysTask * param0, void * param1); static void ov32_022562AC(void * param0); @@ -47,9 +46,9 @@ static void NitroStaticInit (void) ov25_02254238(ov32_022561D4, ov32_022562AC); } -static BOOL ov32_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov32_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov32_0225621C * v0 = (UnkStruct_ov32_0225621C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov32_0225621C)); + UnkStruct_ov32_0225621C * v0 = (UnkStruct_ov32_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov32_0225621C)); if (v0 != NULL) { if (ov32_0225621C(v0, param1, param2, param3)) { @@ -65,14 +64,14 @@ static BOOL ov32_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov32_0225621C (UnkStruct_ov32_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov32_0225621C (UnkStruct_ov32_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { if (ov32_02256470(&(param0->unk_74), &(param0->unk_04), param2)) { param0->unk_00 = 0; param0->unk_01 = 0; param0->unk_02 = 0; - ov32_022563C8(¶m0->unk_04, Party_GetFromSavedata(ov25_02254544(param1))); + ov32_022563C8(¶m0->unk_04, Party_GetFromSavedata(PoketchSystem_SaveData(param1))); param0->unk_04.unk_64 = 0; param0->unk_04.unk_66 = 0; @@ -163,7 +162,7 @@ static BOOL ov32_02256308 (UnkStruct_ov32_0225621C * param0) u32 v0 = ov32_02256B78(param0->unk_04.unk_68, param0->unk_04.unk_6C, param0->unk_04.unk_00); if (v0 >= param0->unk_04.unk_00) { - ov32_022563C8(¶m0->unk_04, Party_GetFromSavedata(ov25_02254544(param0->unk_78))); + ov32_022563C8(¶m0->unk_04, Party_GetFromSavedata(PoketchSystem_SaveData(param0->unk_78))); ov32_02256538(param0->unk_74, 2); } } diff --git a/src/overlay032/ov32_02256470.c b/src/overlay032/ov32_02256470.c index b04ebe3c59..a8fc282b98 100644 --- a/src/overlay032/ov32_02256470.c +++ b/src/overlay032/ov32_02256470.c @@ -23,7 +23,7 @@ #include "unk_02018340.h" #include "pokemon_icon.h" #include "item.h" -#include "overlay025/ov25_02253CE0.h" +#include "overlay025/poketch_system.h" #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -86,7 +86,7 @@ static const struct { BOOL ov32_02256470 (UnkStruct_ov32_02256470 ** param0, const UnkStruct_ov32_02256470_1 * param1, BGL * param2) { - UnkStruct_ov32_02256470 * v0 = (UnkStruct_ov32_02256470 *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov32_02256470)); + UnkStruct_ov32_02256470 * v0 = (UnkStruct_ov32_02256470 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov32_02256470)); if (v0 != NULL) { int v1; diff --git a/src/overlay033/ov33_022561C0.c b/src/overlay033/ov33_022561C0.c index 2632f75345..10fdf1610d 100644 --- a/src/overlay033/ov33_022561C0.c +++ b/src/overlay033/ov33_022561C0.c @@ -6,7 +6,7 @@ #include "struct_decls/sys_task.h" #include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay033/struct_ov33_02256474_decl.h" #include "overlay033/struct_ov33_02256474_1.h" @@ -18,7 +18,6 @@ #include "pokemon.h" #include "pokemon_icon.h" #include "party.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay033/ov33_02256474.h" typedef struct { @@ -27,13 +26,13 @@ typedef struct { u8 unk_02; UnkStruct_ov33_02256474_1 unk_04; UnkStruct_ov33_02256474 * unk_5C; - UnkStruct_ov25_0225424C * unk_60; + PoketchSystem * unk_60; } UnkStruct_ov33_0225621C; static void NitroStaticInit(void); -static BOOL ov33_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); -static BOOL ov33_0225621C(UnkStruct_ov33_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov33_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); +static BOOL ov33_0225621C(UnkStruct_ov33_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3); static u32 ov33_0225630C(u32 param0); static void ov33_0225632C(UnkStruct_ov33_0225621C * param0); static void ov33_02256340(SysTask * param0, void * param1); @@ -48,9 +47,9 @@ static void NitroStaticInit (void) ov25_02254238(ov33_022561D4, ov33_02256374); } -static BOOL ov33_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov33_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov33_0225621C * v0 = (UnkStruct_ov33_0225621C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov33_0225621C)); + UnkStruct_ov33_0225621C * v0 = (UnkStruct_ov33_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov33_0225621C)); if (v0 != NULL) { if (ov33_0225621C(v0, param1, param2, param3)) { @@ -66,7 +65,7 @@ static BOOL ov33_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov33_0225621C (UnkStruct_ov33_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov33_0225621C (UnkStruct_ov33_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { if (ov33_02256474(&(param0->unk_5C), &(param0->unk_04), param2)) { param0->unk_00 = 0; diff --git a/src/overlay033/ov33_02256474.c b/src/overlay033/ov33_02256474.c index 1c2eb5a29c..d78092861f 100644 --- a/src/overlay033/ov33_02256474.c +++ b/src/overlay033/ov33_02256474.c @@ -26,7 +26,7 @@ #include "unk_0201D15C.h" #include "pokemon.h" #include "pokemon_icon.h" -#include "overlay025/ov25_02253CE0.h" +#include "overlay025/poketch_system.h" #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -118,7 +118,7 @@ static void ov33_022572A0(UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33 BOOL ov33_02256474 (UnkStruct_ov33_02256474 ** param0, const UnkStruct_ov33_02256474_1 * param1, BGL * param2) { - UnkStruct_ov33_02256474 * v0 = (UnkStruct_ov33_02256474 *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov33_02256474)); + UnkStruct_ov33_02256474 * v0 = (UnkStruct_ov33_02256474 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov33_02256474)); if (v0 != NULL) { int v1; diff --git a/src/overlay034/ov34_022561C0.c b/src/overlay034/ov34_022561C0.c index d1f12084d7..426d4fa580 100644 --- a/src/overlay034/ov34_022561C0.c +++ b/src/overlay034/ov34_022561C0.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay034/struct_ov34_02256540_decl.h" #include "struct_defs/struct_0203F478.h" @@ -14,7 +14,6 @@ #include "heap.h" #include "unk_02022594.h" #include "unk_0203E880.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay034/ov34_02256540.h" typedef struct { @@ -23,14 +22,14 @@ typedef struct { u8 unk_02; UnkStruct_ov34_02256540_1 unk_04; UnkStruct_ov34_02256540 * unk_48; - UnkStruct_ov25_0225424C * unk_4C; + PoketchSystem * unk_4C; UnkStruct_0203F478 * unk_50; } UnkStruct_ov34_0225621C; static void NitroStaticInit(void); -static BOOL ov34_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); -static BOOL ov34_0225621C(UnkStruct_ov34_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov34_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); +static BOOL ov34_0225621C(UnkStruct_ov34_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov34_02256244(UnkStruct_ov34_0225621C * param0); static void ov34_02256260(SysTask * param0, void * param1); static void ov34_02256294(void * param0); @@ -47,9 +46,9 @@ static void NitroStaticInit (void) ov25_02254238(ov34_022561D4, ov34_02256294); } -static BOOL ov34_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov34_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov34_0225621C * v0 = (UnkStruct_ov34_0225621C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov34_0225621C)); + UnkStruct_ov34_0225621C * v0 = (UnkStruct_ov34_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov34_0225621C)); if (v0 != NULL) { if (ov34_0225621C(v0, param1, param2, param3)) { @@ -65,7 +64,7 @@ static BOOL ov34_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov34_0225621C (UnkStruct_ov34_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov34_0225621C (UnkStruct_ov34_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { if (ov34_02256540(&(param0->unk_48), &(param0->unk_04), param2)) { param0->unk_00 = 0; @@ -217,7 +216,7 @@ static void ov34_02256428 (UnkStruct_ov34_0225621C * param0, int param1, int par static const fx32 v0[] = { 8 << FX32_SHIFT, 24 << FX32_SHIFT, 48 << FX32_SHIFT, }; - UnkStruct_0203F478 * v1 = sub_0203F478(ov25_0225453C(param0->unk_4C), 8); + UnkStruct_0203F478 * v1 = sub_0203F478(PoketchSystem_FieldSystem(param0->unk_4C), 8); UnkStruct_ov34_02256540_1 * v2 = &(param0->unk_04); v2->unk_08 = 0; diff --git a/src/overlay034/ov34_02256540.c b/src/overlay034/ov34_02256540.c index 5f23d0ad05..ad84041a3a 100644 --- a/src/overlay034/ov34_02256540.c +++ b/src/overlay034/ov34_02256540.c @@ -50,7 +50,7 @@ static void ov34_022569E8(UnkStruct_ov34_02256540 * param0); BOOL ov34_02256540 (UnkStruct_ov34_02256540 ** param0, const UnkStruct_ov34_02256540_1 * param1, BGL * param2) { - UnkStruct_ov34_02256540 * v0 = (UnkStruct_ov34_02256540 *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov34_02256540)); + UnkStruct_ov34_02256540 * v0 = (UnkStruct_ov34_02256540 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov34_02256540)); if (v0 != NULL) { int v1; diff --git a/src/overlay035/ov35_022561C0.c b/src/overlay035/ov35_022561C0.c index b88b03b8a6..c0869bab8d 100644 --- a/src/overlay035/ov35_022561C0.c +++ b/src/overlay035/ov35_022561C0.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_02255B34_decl.h" #include "overlay035/struct_ov35_02256410_decl.h" @@ -14,7 +14,6 @@ #include "unk_0200D9E8.h" #include "heap.h" #include "unk_02099D44.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay025/ov25_02255ACC.h" #include "overlay035/ov35_02256410.h" @@ -25,15 +24,15 @@ typedef struct { u32 unk_04; UnkStruct_ov35_02256410_1 unk_08; UnkStruct_ov35_02256410 * unk_10; - UnkStruct_ov25_0225424C * unk_14; + PoketchSystem * unk_14; UnkStruct_ov25_02255B34 * unk_18; u32 unk_1C; } UnkStruct_ov35_0225621C; static void NitroStaticInit(void); -static BOOL ov35_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); -static BOOL ov35_0225621C(UnkStruct_ov35_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov35_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); +static BOOL ov35_0225621C(UnkStruct_ov35_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov35_02256284(u32 param0, u32 param1, u32 param2, void * param3); static void ov35_0225628C(UnkStruct_ov35_0225621C * param0); static void ov35_022562B0(SysTask * param0, void * param1); @@ -48,9 +47,9 @@ static void NitroStaticInit (void) ov25_02254238(ov35_022561D4, ov35_022562EC); } -static BOOL ov35_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov35_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov35_0225621C * v0 = (UnkStruct_ov35_0225621C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov35_0225621C)); + UnkStruct_ov35_0225621C * v0 = (UnkStruct_ov35_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov35_0225621C)); if (v0 != NULL) { if (ov35_0225621C(v0, param1, param2, param3)) { @@ -66,7 +65,7 @@ static BOOL ov35_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov35_0225621C (UnkStruct_ov35_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov35_0225621C (UnkStruct_ov35_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { static const UnkUnion_020225E0 v0[] = { { diff --git a/src/overlay035/ov35_02256410.c b/src/overlay035/ov35_02256410.c index 33cab40da1..f8a9aca33c 100644 --- a/src/overlay035/ov35_02256410.c +++ b/src/overlay035/ov35_02256410.c @@ -17,7 +17,7 @@ #include "unk_02006E3C.h" #include "heap.h" #include "unk_02018340.h" -#include "overlay025/ov25_02253CE0.h" +#include "overlay025/poketch_system.h" #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -45,7 +45,7 @@ static void ov35_022566A8(UnkStruct_ov35_02256410 * param0, const UnkStruct_ov35 BOOL ov35_02256410 (UnkStruct_ov35_02256410 ** param0, const UnkStruct_ov35_02256410_1 * param1, BGL * param2) { - UnkStruct_ov35_02256410 * v0 = (UnkStruct_ov35_02256410 *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov35_02256410)); + UnkStruct_ov35_02256410 * v0 = (UnkStruct_ov35_02256410 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov35_02256410)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); diff --git a/src/overlay036/ov36_022561C0.c b/src/overlay036/ov36_022561C0.c index f3c6391833..693c2da3a5 100644 --- a/src/overlay036/ov36_022561C0.c +++ b/src/overlay036/ov36_022561C0.c @@ -4,19 +4,16 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_02255B34_decl.h" -#include "overlay036/struct_ov36_02256404_decl.h" +#include "overlay036/poketch_app_pedometer.h" #include "struct_defs/union_02022594_020225E0.h" -#include "overlay036/struct_ov36_02256404_1.h" #include "unk_0200D9E8.h" #include "heap.h" #include "poketch_data.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay025/ov25_02255ACC.h" -#include "overlay036/ov36_02256404.h" typedef struct { u8 unk_00; @@ -24,7 +21,7 @@ typedef struct { u8 unk_02; UnkStruct_ov36_02256404_1 unk_04; UnkStruct_ov36_02256404 * unk_0C; - UnkStruct_ov25_0225424C * unk_10; + PoketchSystem * unk_10; UnkStruct_ov25_02255B34 * unk_14; u32 unk_18; PoketchData * unk_1C; @@ -32,8 +29,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov36_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); -static BOOL ov36_0225621C(UnkStruct_ov36_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov36_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); +static BOOL ov36_0225621C(UnkStruct_ov36_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov36_02256278(u32 param0, u32 param1, u32 param2, void * param3); static void ov36_02256280(UnkStruct_ov36_0225621C * param0); static void ov36_02256298(SysTask * param0, void * param1); @@ -48,9 +45,9 @@ static void NitroStaticInit (void) ov25_02254238(ov36_022561D4, ov36_022562D4); } -static BOOL ov36_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov36_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov36_0225621C * v0 = (UnkStruct_ov36_0225621C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov36_0225621C)); + UnkStruct_ov36_0225621C * v0 = (UnkStruct_ov36_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov36_0225621C)); if (v0 != NULL) { if (ov36_0225621C(v0, param1, param2, param3)) { @@ -66,7 +63,7 @@ static BOOL ov36_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov36_0225621C (UnkStruct_ov36_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov36_0225621C (UnkStruct_ov36_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { static const UnkUnion_020225E0 v0[] = { { @@ -78,7 +75,7 @@ static BOOL ov36_0225621C (UnkStruct_ov36_0225621C * param0, UnkStruct_ov25_0225 }; param0->unk_10 = param1; - param0->unk_1C = ov25_02254540(param1); + param0->unk_1C = PoketchSystem_PoketchData(param1); param0->unk_04.unk_04 = 1; param0->unk_04.unk_00 = PoketchData_StepCount(param0->unk_1C); @@ -187,7 +184,7 @@ static BOOL ov36_02256330 (UnkStruct_ov36_0225621C * param0) break; } - if (ov25_02254538(param0->unk_10)) { + if (PoketchSystem_PedometerUpdated(param0->unk_10)) { v0->unk_00 = PoketchData_StepCount(param0->unk_1C); ov36_0225653C(param0->unk_0C, 3); break; diff --git a/src/overlay036/ov36_02256404.c b/src/overlay036/ov36_02256404.c index f4d46530ee..3b608ae566 100644 --- a/src/overlay036/ov36_02256404.c +++ b/src/overlay036/ov36_02256404.c @@ -6,22 +6,20 @@ #include "overlay025/struct_ov25_02255224_decl.h" #include "overlay025/struct_ov25_022555E8_decl.h" #include "overlay025/struct_ov25_022558C4_decl.h" -#include "overlay036/struct_ov36_02256404_decl.h" +#include "overlay036/poketch_app_pedometer.h" #include "overlay025/struct_ov25_0225517C.h" #include "overlay025/struct_ov25_02255810.h" #include "overlay025/struct_ov25_02255958.h" -#include "overlay036/struct_ov36_02256404_1.h" #include "overlay097/struct_ov97_0222DB78.h" #include "unk_02006E3C.h" #include "heap.h" #include "unk_02018340.h" -#include "overlay025/ov25_02253CE0.h" +#include "overlay025/poketch_system.h" #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" -#include "overlay036/ov36_02256404.h" struct UnkStruct_ov36_02256404_t { const UnkStruct_ov36_02256404_1 * unk_00; @@ -45,7 +43,7 @@ static void ov36_0225669C(UnkStruct_ov36_02256404 * param0, const UnkStruct_ov36 BOOL ov36_02256404 (UnkStruct_ov36_02256404 ** param0, const UnkStruct_ov36_02256404_1 * param1, BGL * param2) { - UnkStruct_ov36_02256404 * v0 = (UnkStruct_ov36_02256404 *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov36_02256404)); + UnkStruct_ov36_02256404 * v0 = (UnkStruct_ov36_02256404 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov36_02256404)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); diff --git a/src/overlay037/ov37_022561C0.c b/src/overlay037/ov37_022561C0.c index f9c0109690..c144785a85 100644 --- a/src/overlay037/ov37_022561C0.c +++ b/src/overlay037/ov37_022561C0.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_02255B34_decl.h" #include "overlay037/struct_ov37_022563D4_decl.h" @@ -13,7 +13,6 @@ #include "unk_0200D9E8.h" #include "heap.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay025/ov25_02255ACC.h" #include "overlay037/ov37_022563D4.h" @@ -23,7 +22,7 @@ typedef struct { u8 unk_02; UnkStruct_ov37_022563D4_1 unk_04; UnkStruct_ov37_022563D4 * unk_08; - UnkStruct_ov25_0225424C * unk_0C; + PoketchSystem * unk_0C; UnkStruct_ov25_02255B34 * unk_10; u32 unk_14; u32 unk_18; @@ -31,8 +30,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov37_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); -static BOOL ov37_0225621C(UnkStruct_ov37_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov37_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); +static BOOL ov37_0225621C(UnkStruct_ov37_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov37_02256280(UnkStruct_ov37_0225621C * param0); static void ov37_02256298(u32 param0, u32 param1, u32 param2, void * param3); static void ov37_022562A0(SysTask * param0, void * param1); @@ -47,9 +46,9 @@ static void NitroStaticInit (void) ov25_02254238(ov37_022561D4, ov37_022562DC); } -static BOOL ov37_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov37_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov37_0225621C * v0 = (UnkStruct_ov37_0225621C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov37_0225621C)); + UnkStruct_ov37_0225621C * v0 = (UnkStruct_ov37_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov37_0225621C)); if (v0 != NULL) { if (ov37_0225621C(v0, param1, param2, param3)) { @@ -65,7 +64,7 @@ static BOOL ov37_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov37_0225621C (UnkStruct_ov37_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov37_0225621C (UnkStruct_ov37_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { static const UnkUnion_020225E0 v0[] = { {72, 104, 92, 132}, diff --git a/src/overlay037/ov37_022563D4.c b/src/overlay037/ov37_022563D4.c index f6b3544c24..c1266febf8 100644 --- a/src/overlay037/ov37_022563D4.c +++ b/src/overlay037/ov37_022563D4.c @@ -17,7 +17,7 @@ #include "unk_02006E3C.h" #include "heap.h" #include "unk_02018340.h" -#include "overlay025/ov25_02253CE0.h" +#include "overlay025/poketch_system.h" #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -41,7 +41,7 @@ static void ov37_02256588(SysTask * param0, void * param1); BOOL ov37_022563D4 (UnkStruct_ov37_022563D4 ** param0, const UnkStruct_ov37_022563D4_1 * param1, BGL * param2) { - UnkStruct_ov37_022563D4 * v0 = (UnkStruct_ov37_022563D4 *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov37_022563D4)); + UnkStruct_ov37_022563D4 * v0 = (UnkStruct_ov37_022563D4 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov37_022563D4)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); diff --git a/src/overlay038/ov38_022561C0.c b/src/overlay038/ov38_022561C0.c index 34d11b05db..f5d50cc998 100644 --- a/src/overlay038/ov38_022561C0.c +++ b/src/overlay038/ov38_022561C0.c @@ -4,14 +4,13 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay038/struct_ov38_0225632C_decl.h" #include "overlay038/struct_ov38_0225632C_1.h" #include "unk_0200D9E8.h" #include "heap.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay038/ov38_0225632C.h" typedef struct { @@ -20,15 +19,15 @@ typedef struct { u8 unk_02; UnkStruct_ov38_0225632C_1 unk_04; UnkStruct_ov38_0225632C * unk_08; - UnkStruct_ov25_0225424C * unk_0C; + PoketchSystem * unk_0C; } UnkStruct_ov38_0225621C; static void NitroStaticInit(void); -static BOOL ov38_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov38_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov38_02256254(SysTask * param0, void * param1); static void ov38_02256288(void * param0); -static BOOL ov38_0225621C(UnkStruct_ov38_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov38_0225621C(UnkStruct_ov38_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov38_02256240(UnkStruct_ov38_0225621C * param0); static void ov38_02256290(UnkStruct_ov38_0225621C * param0, u32 param1); static BOOL ov38_022562A4(UnkStruct_ov38_0225621C * param0); @@ -40,9 +39,9 @@ static void NitroStaticInit (void) ov25_02254238(ov38_022561D4, ov38_02256288); } -static BOOL ov38_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov38_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov38_0225621C * v0 = (UnkStruct_ov38_0225621C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov38_0225621C)); + UnkStruct_ov38_0225621C * v0 = (UnkStruct_ov38_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov38_0225621C)); if (v0 != NULL) { if (ov38_0225621C(v0, param1, param2, param3)) { @@ -58,7 +57,7 @@ static BOOL ov38_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov38_0225621C (UnkStruct_ov38_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov38_0225621C (UnkStruct_ov38_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { if (ov38_0225632C(&(param0->unk_08), &(param0->unk_04), param2)) { param0->unk_00 = 0; diff --git a/src/overlay038/ov38_0225632C.c b/src/overlay038/ov38_0225632C.c index f71db26297..408f24b427 100644 --- a/src/overlay038/ov38_0225632C.c +++ b/src/overlay038/ov38_0225632C.c @@ -29,7 +29,7 @@ static void ov38_02256458(SysTask * param0, void * param1); BOOL ov38_0225632C (UnkStruct_ov38_0225632C ** param0, const UnkStruct_ov38_0225632C_1 * param1, BGL * param2) { - UnkStruct_ov38_0225632C * v0 = (UnkStruct_ov38_0225632C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov38_0225632C)); + UnkStruct_ov38_0225632C * v0 = (UnkStruct_ov38_0225632C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov38_0225632C)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 8); diff --git a/src/overlay039/ov39_022561C0.c b/src/overlay039/ov39_022561C0.c index 90f542407b..5041b731dc 100644 --- a/src/overlay039/ov39_022561C0.c +++ b/src/overlay039/ov39_022561C0.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_02255B34_decl.h" #include "overlay039/struct_ov39_022563DC_decl.h" @@ -13,7 +13,6 @@ #include "unk_0200D9E8.h" #include "heap.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay025/ov25_02255ACC.h" #include "overlay039/ov39_022563DC.h" @@ -23,7 +22,7 @@ typedef struct { u8 unk_02; UnkStruct_ov39_022563DC_1 unk_04; UnkStruct_ov39_022563DC * unk_24; - UnkStruct_ov25_0225424C * unk_28; + PoketchSystem * unk_28; UnkStruct_ov25_02255B34 * unk_2C; u32 unk_30; u32 unk_34; @@ -31,8 +30,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov39_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); -static BOOL ov39_0225621C(UnkStruct_ov39_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov39_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); +static BOOL ov39_0225621C(UnkStruct_ov39_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov39_02256268(UnkStruct_ov39_0225621C * param0); static void ov39_02256284(u32 param0, u32 param1, u32 param2, void * param3); static void ov39_0225628C(SysTask * param0, void * param1); @@ -47,9 +46,9 @@ static void NitroStaticInit (void) ov25_02254238(ov39_022561D4, ov39_022562C8); } -static BOOL ov39_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov39_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov39_0225621C * v0 = (UnkStruct_ov39_0225621C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov39_0225621C)); + UnkStruct_ov39_0225621C * v0 = (UnkStruct_ov39_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov39_0225621C)); if (v0 != NULL) { if (ov39_0225621C(v0, param1, param2, param3)) { @@ -65,7 +64,7 @@ static BOOL ov39_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov39_0225621C (UnkStruct_ov39_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov39_0225621C (UnkStruct_ov39_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { if (ov39_022563DC(&(param0->unk_24), &(param0->unk_04), param2)) { static const UnkUnion_020225E0 v0[] = { diff --git a/src/overlay039/ov39_022563DC.c b/src/overlay039/ov39_022563DC.c index 1cdfd023bf..04e03cd1c5 100644 --- a/src/overlay039/ov39_022563DC.c +++ b/src/overlay039/ov39_022563DC.c @@ -32,7 +32,7 @@ static void ov39_0225659C(UnkStruct_ov39_022563DC * param0, u32 param1, BOOL par BOOL ov39_022563DC (UnkStruct_ov39_022563DC ** param0, const UnkStruct_ov39_022563DC_1 * param1, BGL * param2) { - UnkStruct_ov39_022563DC * v0 = (UnkStruct_ov39_022563DC *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov39_022563DC)); + UnkStruct_ov39_022563DC * v0 = (UnkStruct_ov39_022563DC *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov39_022563DC)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); diff --git a/src/overlay040/ov40_022561C0.c b/src/overlay040/ov40_022561C0.c index 28e7737799..b91806794a 100644 --- a/src/overlay040/ov40_022561C0.c +++ b/src/overlay040/ov40_022561C0.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_02026218_decl.h" #include "struct_decls/struct_02026310_decl.h" #include "pokemon.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay040/struct_ov40_0225645C_decl.h" #include "overlay040/struct_ov40_0225645C_1.h" @@ -19,7 +19,6 @@ #include "pokemon.h" #include "pokemon_icon.h" #include "overlay005/ov5_021E622C.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay040/ov40_0225645C.h" typedef struct { @@ -28,14 +27,14 @@ typedef struct { u8 unk_02; UnkStruct_ov40_0225645C_1 unk_04; UnkStruct_ov40_0225645C * unk_28; - UnkStruct_ov25_0225424C * unk_2C; + PoketchSystem * unk_2C; UnkStruct_02026310 * unk_30; } UnkStruct_ov40_0225621C; static void NitroStaticInit(void); -static BOOL ov40_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); -static BOOL ov40_0225621C(UnkStruct_ov40_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov40_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); +static BOOL ov40_0225621C(UnkStruct_ov40_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov40_0225625C(UnkStruct_ov40_0225621C * param0); static void ov40_02256270(SysTask * param0, void * param1); static void ov40_022562A4(void * param0); @@ -51,9 +50,9 @@ static void NitroStaticInit (void) ov25_02254238(ov40_022561D4, ov40_022562A4); } -static BOOL ov40_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov40_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov40_0225621C * v0 = (UnkStruct_ov40_0225621C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov40_0225621C)); + UnkStruct_ov40_0225621C * v0 = (UnkStruct_ov40_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov40_0225621C)); if (v0 != NULL) { if (ov40_0225621C(v0, param1, param2, param3)) { @@ -69,9 +68,9 @@ static BOOL ov40_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov40_0225621C (UnkStruct_ov40_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov40_0225621C (UnkStruct_ov40_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { - param0->unk_30 = sub_02026310(ov25_02254544(param1)); + param0->unk_30 = sub_02026310(PoketchSystem_SaveData(param1)); ov40_022563D0(¶m0->unk_04, param0->unk_30); diff --git a/src/overlay040/ov40_0225645C.c b/src/overlay040/ov40_0225645C.c index 620649d2e5..c7d0ceb2d5 100644 --- a/src/overlay040/ov40_0225645C.c +++ b/src/overlay040/ov40_0225645C.c @@ -20,7 +20,7 @@ #include "unk_02018340.h" #include "pokemon.h" #include "pokemon_icon.h" -#include "overlay025/ov25_02253CE0.h" +#include "overlay025/poketch_system.h" #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -57,7 +57,7 @@ static void ov40_02256A14(UnkStruct_ov25_022558C4 * param0, u32 param1); BOOL ov40_0225645C (UnkStruct_ov40_0225645C ** param0, const UnkStruct_ov40_0225645C_1 * param1, BGL * param2) { - UnkStruct_ov40_0225645C * v0 = (UnkStruct_ov40_0225645C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov40_0225645C)); + UnkStruct_ov40_0225645C * v0 = (UnkStruct_ov40_0225645C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov40_0225645C)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); diff --git a/src/overlay041/ov41_022561C0.c b/src/overlay041/ov41_022561C0.c index d02f49517b..0c05246790 100644 --- a/src/overlay041/ov41_022561C0.c +++ b/src/overlay041/ov41_022561C0.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_02255B34_decl.h" #include "overlay041/struct_ov41_022567B0_decl.h" @@ -13,7 +13,6 @@ #include "unk_0200D9E8.h" #include "heap.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay025/ov25_02255ACC.h" #include "overlay041/ov41_022567B0.h" @@ -24,7 +23,7 @@ typedef struct { u8 unk_03; UnkStruct_ov41_022567B0_1 unk_04; UnkStruct_ov41_022567B0 * unk_5B7C; - UnkStruct_ov25_0225424C * unk_5B80; + PoketchSystem * unk_5B80; UnkStruct_ov25_02255B34 * unk_5B84; u32 unk_5B88; u32 unk_5B8C; @@ -32,8 +31,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov41_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); -static BOOL ov41_02256220(UnkStruct_ov41_02256220 * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov41_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); +static BOOL ov41_02256220(UnkStruct_ov41_02256220 * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov41_02256294(UnkStruct_ov41_02256220 * param0); static void ov41_022562B8(SysTask * param0, void * param1); static void ov41_02256300(u32 param0, u32 param1, u32 param2, void * param3); @@ -52,9 +51,9 @@ static void NitroStaticInit (void) ov25_02254238(ov41_022561D4, ov41_02256310); } -static BOOL ov41_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov41_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov41_02256220 * v0 = (UnkStruct_ov41_02256220 *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov41_02256220)); + UnkStruct_ov41_02256220 * v0 = (UnkStruct_ov41_02256220 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov41_02256220)); if (v0 != NULL) { if (ov41_02256220(v0, param1, param2, param3)) { @@ -70,7 +69,7 @@ static BOOL ov41_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov41_02256220 (UnkStruct_ov41_02256220 * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov41_02256220 (UnkStruct_ov41_02256220 * param0, PoketchSystem * param1, BGL * param2, u32 param3) { static const UnkUnion_020225E0 v0[] = { {34, 66, 167, 207}, diff --git a/src/overlay041/ov41_022567B0.c b/src/overlay041/ov41_022567B0.c index 08c9e864f1..0ce4eab733 100644 --- a/src/overlay041/ov41_022567B0.c +++ b/src/overlay041/ov41_022567B0.c @@ -21,7 +21,7 @@ #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_02099D44.h" -#include "overlay025/ov25_02253CE0.h" +#include "overlay025/poketch_system.h" #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -60,7 +60,7 @@ static void ov41_02256D1C(SysTask * param0, void * param1); BOOL ov41_022567B0 (UnkStruct_ov41_022567B0 ** param0, const UnkStruct_ov41_022567B0_1 * param1, BGL * param2) { - UnkStruct_ov41_022567B0 * v0 = (UnkStruct_ov41_022567B0 *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov41_022567B0)); + UnkStruct_ov41_022567B0 * v0 = (UnkStruct_ov41_022567B0 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov41_022567B0)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); diff --git a/src/overlay042/ov42_022561C0.c b/src/overlay042/ov42_022561C0.c index 6511c3e99f..c5b9c44d87 100644 --- a/src/overlay042/ov42_022561C0.c +++ b/src/overlay042/ov42_022561C0.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay042/struct_ov42_022563D4_decl.h" #include "overlay042/struct_ov42_022563D4_1.h" @@ -13,7 +13,6 @@ #include "heap.h" #include "unk_0201D15C.h" #include "unk_02099D44.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay042/ov42_022563D4.h" typedef struct { @@ -23,13 +22,13 @@ typedef struct { u32 unk_04; UnkStruct_ov42_022563D4_1 unk_08; UnkStruct_ov42_022563D4 * unk_0C; - UnkStruct_ov25_0225424C * unk_10; + PoketchSystem * unk_10; } UnkStruct_ov42_0225621C; static void NitroStaticInit(void); -static BOOL ov42_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); -static BOOL ov42_0225621C(UnkStruct_ov42_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov42_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); +static BOOL ov42_0225621C(UnkStruct_ov42_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov42_02256260(UnkStruct_ov42_0225621C * param0); static void ov42_02256280(SysTask * param0, void * param1); static void ov42_022562B4(void * param0); @@ -44,9 +43,9 @@ static void NitroStaticInit (void) ov25_02254238(ov42_022561D4, ov42_022562B4); } -static BOOL ov42_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov42_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov42_0225621C * v0 = (UnkStruct_ov42_0225621C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov42_0225621C)); + UnkStruct_ov42_0225621C * v0 = (UnkStruct_ov42_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov42_0225621C)); if (v0 != NULL) { if (ov42_0225621C(v0, param1, param2, param3)) { @@ -62,7 +61,7 @@ static BOOL ov42_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov42_0225621C (UnkStruct_ov42_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov42_0225621C (UnkStruct_ov42_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { param0->unk_04 = param3; diff --git a/src/overlay042/ov42_022563D4.c b/src/overlay042/ov42_022563D4.c index c3c59b75f2..dc0bcd11b3 100644 --- a/src/overlay042/ov42_022563D4.c +++ b/src/overlay042/ov42_022563D4.c @@ -17,7 +17,7 @@ #include "unk_02006E3C.h" #include "heap.h" #include "unk_02018340.h" -#include "overlay025/ov25_02253CE0.h" +#include "overlay025/poketch_system.h" #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -47,7 +47,7 @@ static void ov42_022565C4(SysTask * param0, void * param1); BOOL ov42_022563D4 (UnkStruct_ov42_022563D4 ** param0, const UnkStruct_ov42_022563D4_1 * param1, BGL * param2) { - UnkStruct_ov42_022563D4 * v0 = (UnkStruct_ov42_022563D4 *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov42_022563D4)); + UnkStruct_ov42_022563D4 * v0 = (UnkStruct_ov42_022563D4 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov42_022563D4)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); diff --git a/src/overlay043/ov43_022561C0.c b/src/overlay043/ov43_022561C0.c index 255b488d0e..5324283ff3 100644 --- a/src/overlay043/ov43_022561C0.c +++ b/src/overlay043/ov43_022561C0.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_02255B34_decl.h" #include "overlay043/struct_ov43_02256544_decl.h" @@ -14,7 +14,6 @@ #include "unk_0200D9E8.h" #include "heap.h" #include "unk_02099D44.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay025/ov25_02255ACC.h" #include "overlay043/ov43_02256544.h" @@ -25,15 +24,15 @@ typedef struct { u32 unk_04; UnkStruct_ov43_02256544_1 unk_08; UnkStruct_ov43_02256544 * unk_14; - UnkStruct_ov25_0225424C * unk_18; + PoketchSystem * unk_18; UnkStruct_ov25_02255B34 * unk_1C; u32 unk_20; } UnkStruct_ov43_0225621C; static void NitroStaticInit(void); -static BOOL ov43_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); -static BOOL ov43_0225621C(UnkStruct_ov43_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov43_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); +static BOOL ov43_0225621C(UnkStruct_ov43_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov43_02256288(UnkStruct_ov43_02256544_1 * param0); static void ov43_022562A8(UnkStruct_ov43_0225621C * param0); static void ov43_022562CC(SysTask * param0, void * param1); @@ -51,9 +50,9 @@ static void NitroStaticInit (void) ov25_02254238(ov43_022561D4, ov43_02256310); } -static BOOL ov43_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov43_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov43_0225621C * v0 = (UnkStruct_ov43_0225621C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov43_0225621C)); + UnkStruct_ov43_0225621C * v0 = (UnkStruct_ov43_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov43_0225621C)); if (v0 != NULL) { if (ov43_0225621C(v0, param1, param2, param3)) { @@ -69,7 +68,7 @@ static BOOL ov43_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov43_0225621C (UnkStruct_ov43_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov43_0225621C (UnkStruct_ov43_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { static const UnkUnion_020225E0 v0[] = { {112, 144, 16, 40}, diff --git a/src/overlay043/ov43_02256544.c b/src/overlay043/ov43_02256544.c index f744366711..2ae908157c 100644 --- a/src/overlay043/ov43_02256544.c +++ b/src/overlay043/ov43_02256544.c @@ -24,7 +24,7 @@ #include "unk_02018340.h" #include "unk_0201D670.h" #include "strbuf.h" -#include "overlay025/ov25_02253CE0.h" +#include "overlay025/poketch_system.h" #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -64,7 +64,7 @@ static void ov43_02256A4C(UnkStruct_ov43_02256544 * param0, u32 param1); BOOL ov43_02256544 (UnkStruct_ov43_02256544 ** param0, const UnkStruct_ov43_02256544_1 * param1, BGL * param2) { - UnkStruct_ov43_02256544 * v0 = (UnkStruct_ov43_02256544 *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov43_02256544)); + UnkStruct_ov43_02256544 * v0 = (UnkStruct_ov43_02256544 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov43_02256544)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 8); diff --git a/src/overlay044/ov44_022561C0.c b/src/overlay044/ov44_022561C0.c index c4ecae8e03..2f5f8b6afc 100644 --- a/src/overlay044/ov44_022561C0.c +++ b/src/overlay044/ov44_022561C0.c @@ -6,7 +6,7 @@ #include "struct_decls/sys_task.h" #include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_02255B34_decl.h" #include "overlay044/struct_ov44_022565BC_decl.h" @@ -19,7 +19,6 @@ #include "pokemon_icon.h" #include "party.h" #include "overlay005/ov5_021E622C.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay025/ov25_02255ACC.h" #include "overlay044/ov44_022565BC.h" @@ -29,7 +28,7 @@ typedef struct { u8 unk_02; UnkStruct_ov44_022565BC_1 unk_04; UnkStruct_ov44_022565BC * unk_38; - UnkStruct_ov25_0225424C * unk_3C; + PoketchSystem * unk_3C; UnkStruct_ov25_02255B34 * unk_40; u16 unk_44; u16 unk_46; @@ -39,8 +38,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov44_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); -static BOOL ov44_0225621C(UnkStruct_ov44_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov44_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); +static BOOL ov44_0225621C(UnkStruct_ov44_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov44_02256314(UnkStruct_ov44_0225621C * param0); static void ov44_0225632C(u32 param0, u32 param1, u32 param2, void * param3); static void ov44_02256338(SysTask * param0, void * param1); @@ -57,9 +56,9 @@ static void NitroStaticInit (void) ov25_02254238(ov44_022561D4, ov44_02256374); } -static BOOL ov44_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov44_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov44_0225621C * v0 = (UnkStruct_ov44_0225621C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov44_0225621C)); + UnkStruct_ov44_0225621C * v0 = (UnkStruct_ov44_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov44_0225621C)); if (v0 != NULL) { if (ov44_0225621C(v0, param1, param2, param3)) { @@ -75,9 +74,9 @@ static BOOL ov44_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov44_0225621C (UnkStruct_ov44_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov44_0225621C (UnkStruct_ov44_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { - Party * v0 = Party_GetFromSavedata(ov25_02254544(param1)); + Party * v0 = Party_GetFromSavedata(PoketchSystem_SaveData(param1)); Pokemon * v1; int v2; int v3 = 0; diff --git a/src/overlay044/ov44_022565BC.c b/src/overlay044/ov44_022565BC.c index 9c5c0b0413..ec460ae756 100644 --- a/src/overlay044/ov44_022565BC.c +++ b/src/overlay044/ov44_022565BC.c @@ -19,7 +19,7 @@ #include "unk_02018340.h" #include "pokemon.h" #include "pokemon_icon.h" -#include "overlay025/ov25_02253CE0.h" +#include "overlay025/poketch_system.h" #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -61,7 +61,7 @@ static BOOL ov44_02256AC8(UnkStruct_ov44_022565BC * param0, const UnkStruct_ov44 BOOL ov44_022565BC (UnkStruct_ov44_022565BC ** param0, const UnkStruct_ov44_022565BC_1 * param1, BGL * param2) { - UnkStruct_ov44_022565BC * v0 = (UnkStruct_ov44_022565BC *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov44_022565BC)); + UnkStruct_ov44_022565BC * v0 = (UnkStruct_ov44_022565BC *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov44_022565BC)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); diff --git a/src/overlay045/ov45_022561C0.c b/src/overlay045/ov45_022561C0.c index 9008e74031..35dcb40173 100644 --- a/src/overlay045/ov45_022561C0.c +++ b/src/overlay045/ov45_022561C0.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_02255B34_decl.h" #include "overlay045/struct_ov45_022566EC_decl.h" @@ -15,7 +15,6 @@ #include "rtc.h" #include "heap.h" #include "poketch_data.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay025/ov25_02255ACC.h" #include "overlay045/ov45_022566EC.h" @@ -25,7 +24,7 @@ typedef struct { u8 unk_02; UnkStruct_ov45_022566EC_1 unk_03; UnkStruct_ov45_022566EC * unk_08; - UnkStruct_ov25_0225424C * unk_0C; + PoketchSystem * unk_0C; PoketchData * unk_10; UnkStruct_ov25_02255B34 * unk_14; u32 unk_18; @@ -37,8 +36,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov45_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); -static BOOL ov45_0225621C(UnkStruct_ov45_022561D4 * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov45_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); +static BOOL ov45_0225621C(UnkStruct_ov45_022561D4 * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov45_022562C0(UnkStruct_ov45_022566EC_1 * param0); static void ov45_022562F8(UnkStruct_ov45_022561D4 * param0); static void ov45_02256310(u32 param0, u32 param1, u32 param2, void * param3); @@ -60,9 +59,9 @@ static void NitroStaticInit (void) ov25_02254238(ov45_022561D4, ov45_02256354); } -static BOOL ov45_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov45_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov45_022561D4 * v0 = (UnkStruct_ov45_022561D4 *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov45_022561D4)); + UnkStruct_ov45_022561D4 * v0 = (UnkStruct_ov45_022561D4 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov45_022561D4)); if (v0 != NULL) { if (ov45_0225621C(v0, param1, param2, param3)) { @@ -78,7 +77,7 @@ static BOOL ov45_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov45_0225621C (UnkStruct_ov45_022561D4 * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov45_0225621C (UnkStruct_ov45_022561D4 * param0, PoketchSystem * param1, BGL * param2, u32 param3) { static const UnkUnion_020225E0 v0[] = { {72, 104, 176, 208, }, @@ -90,7 +89,7 @@ static BOOL ov45_0225621C (UnkStruct_ov45_022561D4 * param0, UnkStruct_ov25_0225 }; u32 v1, v2; - param0->unk_10 = ov25_02254540(param1); + param0->unk_10 = PoketchSystem_PoketchData(param1); param0->unk_03.unk_00 = PoketchData_IsAlarmSet(param0->unk_10); PoketchData_AlarmTime(param0->unk_10, &v1, &v2); diff --git a/src/overlay045/ov45_022566EC.c b/src/overlay045/ov45_022566EC.c index c53ef5175c..16d70f0ee3 100644 --- a/src/overlay045/ov45_022566EC.c +++ b/src/overlay045/ov45_022566EC.c @@ -18,7 +18,7 @@ #include "unk_02006E3C.h" #include "heap.h" #include "unk_02018340.h" -#include "overlay025/ov25_02253CE0.h" +#include "overlay025/poketch_system.h" #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -50,7 +50,7 @@ static void ov45_02256B78(SysTask * param0, void * param1); BOOL ov45_022566EC (UnkStruct_ov45_022566EC ** param0, const UnkStruct_ov45_022566EC_1 * param1, BGL * param2) { - UnkStruct_ov45_022566EC * v0 = (UnkStruct_ov45_022566EC *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov45_022566EC)); + UnkStruct_ov45_022566EC * v0 = (UnkStruct_ov45_022566EC *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov45_022566EC)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 8); diff --git a/src/overlay046/ov46_022561C0.c b/src/overlay046/ov46_022561C0.c index 3aa989b4d3..5dfcd9f650 100644 --- a/src/overlay046/ov46_022561C0.c +++ b/src/overlay046/ov46_022561C0.c @@ -6,7 +6,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_02255B34_decl.h" #include "overlay046/struct_ov46_02256BCC_decl.h" @@ -17,7 +17,6 @@ #include "heap.h" #include "unk_02022844.h" #include "unk_02099D44.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay025/ov25_02255ACC.h" #include "overlay046/ov46_02256BCC.h" @@ -39,7 +38,7 @@ typedef struct { u8 unk_03; u32 unk_04; UnkStruct_ov46_02256BCC * unk_08; - UnkStruct_ov25_0225424C * unk_0C; + PoketchSystem * unk_0C; UnkStruct_ov25_02255B34 * unk_10; u32 unk_14; u32 unk_18; @@ -59,14 +58,14 @@ enum { static void NitroStaticInit(void); -static BOOL ov46_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov46_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov46_0225621C(UnkStruct_ov46_0225621C * param0); static void ov46_0225623C(UnkStruct_ov46_0225621C * param0, u32 param1, BOOL param2); static void ov46_02256258(UnkStruct_ov46_0225621C * param0, u32 param1, u32 param2); static void ov46_02256270(UnkStruct_ov46_0225621C * param0, UnkStruct_ov46_02256270 * param1); static void ov46_0225628C(UnkStruct_ov46_0225621C * param0); static void ov46_022562D4(UnkStruct_ov46_0225621C * param0); -static BOOL ov46_02256310(UnkStruct_ov46_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov46_02256310(UnkStruct_ov46_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov46_022563B8(UnkStruct_ov46_0225621C * param0); static void ov46_022563D8(u32 param0, u32 param1, u32 param2, void * param3); static void ov46_02256408(SysTask * param0, void * param1); @@ -92,9 +91,9 @@ static void NitroStaticInit (void) ov25_02254238(ov46_022561D4, ov46_02256458); } -static BOOL ov46_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov46_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov46_0225621C * v0 = (UnkStruct_ov46_0225621C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov46_0225621C)); + UnkStruct_ov46_0225621C * v0 = (UnkStruct_ov46_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov46_0225621C)); if (v0 != NULL) { if (ov46_02256310(v0, param1, param2, param3)) { @@ -175,7 +174,7 @@ static void ov46_022562D4 (UnkStruct_ov46_0225621C * param0) ov46_0225623C(param0, 1, 0); } -static BOOL ov46_02256310 (UnkStruct_ov46_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov46_02256310 (UnkStruct_ov46_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { static const UnkUnion_020225E0 v0[] = { {144, 176, 16, 80}, diff --git a/src/overlay046/ov46_02256BCC.c b/src/overlay046/ov46_02256BCC.c index 077dd13eb7..c38d8c9950 100644 --- a/src/overlay046/ov46_02256BCC.c +++ b/src/overlay046/ov46_02256BCC.c @@ -17,7 +17,7 @@ #include "unk_02006E3C.h" #include "heap.h" #include "unk_02018340.h" -#include "overlay025/ov25_02253CE0.h" +#include "overlay025/poketch_system.h" #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -53,7 +53,7 @@ static void ov46_022570C4(UnkStruct_ov46_02256BCC * param0, BOOL param1); BOOL ov46_02256BCC (UnkStruct_ov46_02256BCC ** param0, const UnkStruct_ov46_02256BCC_1 * param1, BGL * param2) { - UnkStruct_ov46_02256BCC * v0 = (UnkStruct_ov46_02256BCC *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov46_02256BCC)); + UnkStruct_ov46_02256BCC * v0 = (UnkStruct_ov46_02256BCC *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov46_02256BCC)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 8); diff --git a/src/overlay047/ov47_022561C0.c b/src/overlay047/ov47_022561C0.c index 692abde2d9..6ea70401a5 100644 --- a/src/overlay047/ov47_022561C0.c +++ b/src/overlay047/ov47_022561C0.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" #include "struct_decls/struct_020507E4_decl.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay047/struct_ov47_02256634_decl.h" #include "struct_defs/struct_0202D7B0.h" @@ -20,7 +20,6 @@ #include "unk_020507CC.h" #include "poketch_data.h" #include "unk_0206AFE0.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay047/ov47_02256634.h" typedef struct { @@ -29,7 +28,7 @@ typedef struct { u8 unk_02; UnkStruct_ov47_02256634_1 unk_04; UnkStruct_ov47_02256634 * unk_70; - UnkStruct_ov25_0225424C * unk_74; + PoketchSystem * unk_74; PoketchData * unk_78; UnkStruct_0206C638 * unk_7C[6]; u8 unk_94[6]; @@ -38,8 +37,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov47_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); -static BOOL ov47_0225621C(UnkStruct_ov47_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov47_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); +static BOOL ov47_0225621C(UnkStruct_ov47_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov47_0225634C(UnkStruct_ov47_0225621C * param0); static void ov47_02256384(SysTask * param0, void * param1); static void ov47_022563B8(void * param0); @@ -56,9 +55,9 @@ static void NitroStaticInit (void) ov25_02254238(ov47_022561D4, ov47_022563B8); } -static BOOL ov47_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov47_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov47_0225621C * v0 = (UnkStruct_ov47_0225621C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov47_0225621C)); + UnkStruct_ov47_0225621C * v0 = (UnkStruct_ov47_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov47_0225621C)); if (v0 != NULL) { if (ov47_0225621C(v0, param1, param2, param3)) { @@ -74,11 +73,11 @@ static BOOL ov47_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov47_0225621C (UnkStruct_ov47_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov47_0225621C (UnkStruct_ov47_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { int v0; - param0->unk_78 = ov25_02254540(param1); + param0->unk_78 = PoketchSystem_PoketchData(param1); for (v0 = 0; v0 < 6; v0++) { param0->unk_04.unk_0C[v0].unk_03 = 1; @@ -97,7 +96,7 @@ static BOOL ov47_0225621C (UnkStruct_ov47_0225621C * param0, UnkStruct_ov25_0225 param0->unk_04.unk_08 = 0; { - UnkStruct_020507E4 * v1 = SaveData_Events(ov25_02254544(param1)); + UnkStruct_020507E4 * v1 = SaveData_Events(PoketchSystem_SaveData(param1)); for (v0 = 0; v0 < 4; v0++) { param0->unk_04.unk_2C[v0] = sub_0206B1F0(v1, v0); @@ -105,7 +104,7 @@ static BOOL ov47_0225621C (UnkStruct_ov47_0225621C * param0, UnkStruct_ov25_0225 } { - UnkStruct_0202D7B0 * v2 = sub_0202D834(ov25_02254544(param1)); + UnkStruct_0202D7B0 * v2 = sub_0202D834(PoketchSystem_SaveData(param1)); for (v0 = 0; v0 < 6; v0++) { param0->unk_7C[v0] = sub_0202D924(v2, v0); @@ -114,7 +113,7 @@ static BOOL ov47_0225621C (UnkStruct_ov47_0225621C * param0, UnkStruct_ov25_0225 } } - inline_ov47_0225621C(ov25_0225453C(param1), &(param0->unk_04.unk_00), &(param0->unk_04.unk_04)); + inline_ov47_0225621C(PoketchSystem_FieldSystem(param1), &(param0->unk_04.unk_00), &(param0->unk_04.unk_04)); if (ov47_02256634(&(param0->unk_70), &(param0->unk_04), param2)) { param0->unk_00 = 0; @@ -304,7 +303,7 @@ static BOOL ov47_02256584 (UnkStruct_ov47_0225621C * param0) if (ov25_02254534(param0->unk_74)) { int v1, v2; - inline_ov47_0225621C(ov25_0225453C(param0->unk_74), &v1, &v2); + inline_ov47_0225621C(PoketchSystem_FieldSystem(param0->unk_74), &v1, &v2); if ((v1 != param0->unk_04.unk_00) || (v2 != param0->unk_04.unk_04)) { param0->unk_04.unk_00 = v1; diff --git a/src/overlay047/ov47_02256634.c b/src/overlay047/ov47_02256634.c index 2992c91984..180e69ecd8 100644 --- a/src/overlay047/ov47_02256634.c +++ b/src/overlay047/ov47_02256634.c @@ -46,7 +46,7 @@ static void ov47_02256968(SysTask * param0, void * param1); BOOL ov47_02256634 (UnkStruct_ov47_02256634 ** param0, const UnkStruct_ov47_02256634_1 * param1, BGL * param2) { - UnkStruct_ov47_02256634 * v0 = (UnkStruct_ov47_02256634 *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov47_02256634)); + UnkStruct_ov47_02256634 * v0 = (UnkStruct_ov47_02256634 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov47_02256634)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); diff --git a/src/overlay048/ov48_022561C0.c b/src/overlay048/ov48_022561C0.c index daed4651f8..2fbe799804 100644 --- a/src/overlay048/ov48_022561C0.c +++ b/src/overlay048/ov48_022561C0.c @@ -8,7 +8,7 @@ #include "struct_decls/sys_task.h" #include "struct_decls/struct_02027854_decl.h" #include "struct_decls/struct_020507E4_decl.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay048/struct_ov48_0225650C_decl.h" #include "overlay048/struct_ov48_0225650C_1.h" @@ -19,7 +19,6 @@ #include "unk_02027B70.h" #include "unk_020507CC.h" #include "unk_0206AFE0.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay048/ov48_0225650C.h" static const struct { @@ -152,13 +151,13 @@ typedef struct { u8 unk_02; UnkStruct_ov48_0225650C_1 unk_04; UnkStruct_ov48_0225650C * unk_A8; - UnkStruct_ov25_0225424C * unk_AC; + PoketchSystem * unk_AC; } UnkStruct_ov48_0225621C; static void NitroStaticInit(void); -static BOOL ov48_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); -static BOOL ov48_0225621C(UnkStruct_ov48_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov48_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); +static BOOL ov48_0225621C(UnkStruct_ov48_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov48_022562A8(UnkStruct_ov48_0225621C * param0); static void ov48_022562BC(SysTask * param0, void * param1); static void ov48_022562F0(void * param0); @@ -168,16 +167,16 @@ static BOOL ov48_02256358(UnkStruct_ov48_0225621C * param0); static BOOL ov48_022563D0(UnkStruct_ov48_0225621C * param0); static int ov48_02256408(UnkStruct_ov48_0225621C * param0); static BOOL ov48_02256478(UnkStruct_ov48_0225621C * param0); -static void ov48_022564E0(UnkStruct_ov48_0225621C * param0, UnkStruct_ov25_0225424C * param1); +static void ov48_022564E0(UnkStruct_ov48_0225621C * param0, PoketchSystem * param1); static void NitroStaticInit (void) { ov25_02254238(ov48_022561D4, ov48_022562F0); } -static BOOL ov48_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov48_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov48_0225621C * v0 = (UnkStruct_ov48_0225621C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov48_0225621C)); + UnkStruct_ov48_0225621C * v0 = (UnkStruct_ov48_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov48_0225621C)); if (v0 != NULL) { if (ov48_0225621C(v0, param1, param2, param3)) { @@ -193,12 +192,12 @@ static BOOL ov48_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov48_0225621C (UnkStruct_ov48_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov48_0225621C (UnkStruct_ov48_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { param0->unk_AC = param1; param0->unk_04.unk_08 = ov48_02256408(param0); - inline_ov47_0225621C(ov25_0225453C(param0->unk_AC), &(param0->unk_04.unk_00), &(param0->unk_04.unk_04)); + inline_ov47_0225621C(PoketchSystem_FieldSystem(param0->unk_AC), &(param0->unk_04.unk_00), &(param0->unk_04.unk_04)); ov48_022564E0(param0, param1); @@ -314,7 +313,7 @@ static BOOL ov48_022563D0 (UnkStruct_ov48_0225621C * param0) static int ov48_02256408 (UnkStruct_ov48_0225621C * param0) { - UnkStruct_02027854 * v0 = sub_02027854(ov25_02254544(param0->unk_AC)); + UnkStruct_02027854 * v0 = sub_02027854(PoketchSystem_SaveData(param0->unk_AC)); int v1, v2; for (v1 = 0, v2 = 0; v1 < (NELEMS(Unk_ov48_02256A38)); v1++) { @@ -342,7 +341,7 @@ static BOOL ov48_02256478 (UnkStruct_ov48_0225621C * param0) if (ov25_02254534(param0->unk_AC)) { int v1, v2; - inline_ov47_0225621C(ov25_0225453C(param0->unk_AC), &v1, &v2); + inline_ov47_0225621C(PoketchSystem_FieldSystem(param0->unk_AC), &v1, &v2); if ((v1 != param0->unk_04.unk_00) || (v2 != param0->unk_04.unk_04)) { param0->unk_04.unk_00 = v1; @@ -354,9 +353,9 @@ static BOOL ov48_02256478 (UnkStruct_ov48_0225621C * param0) return v0; } -static void ov48_022564E0 (UnkStruct_ov48_0225621C * param0, UnkStruct_ov25_0225424C * param1) +static void ov48_022564E0 (UnkStruct_ov48_0225621C * param0, PoketchSystem * param1) { - UnkStruct_020507E4 * v0 = SaveData_Events(ov25_02254544(param1)); + UnkStruct_020507E4 * v0 = SaveData_Events(PoketchSystem_SaveData(param1)); int v1; for (v1 = 0; v1 < 4; v1++) { diff --git a/src/overlay048/ov48_0225650C.c b/src/overlay048/ov48_0225650C.c index 4b2963c378..c5a52eb34f 100644 --- a/src/overlay048/ov48_0225650C.c +++ b/src/overlay048/ov48_0225650C.c @@ -23,7 +23,7 @@ #include "unk_02018340.h" #include "unk_0201D670.h" #include "strbuf.h" -#include "overlay025/ov25_02253CE0.h" +#include "overlay025/poketch_system.h" #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -58,7 +58,7 @@ static void ov48_022569FC(SysTask * param0, void * param1); BOOL ov48_0225650C (UnkStruct_ov48_0225650C ** param0, const UnkStruct_ov48_0225650C_1 * param1, BGL * param2) { - UnkStruct_ov48_0225650C * v0 = (UnkStruct_ov48_0225650C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov48_0225650C)); + UnkStruct_ov48_0225650C * v0 = (UnkStruct_ov48_0225650C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov48_0225650C)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); diff --git a/src/overlay049/ov49_022561C0.c b/src/overlay049/ov49_022561C0.c index af30867d6c..d55720ccfb 100644 --- a/src/overlay049/ov49_022561C0.c +++ b/src/overlay049/ov49_022561C0.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay049/struct_ov49_022563D4_decl.h" #include "overlay049/struct_ov49_022563D4_1.h" @@ -13,7 +13,6 @@ #include "heap.h" #include "unk_02022594.h" #include "poketch_data.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay049/ov49_022563D4.h" typedef struct { @@ -23,14 +22,14 @@ typedef struct { u8 unk_03; UnkStruct_ov49_022563D4_1 unk_04; UnkStruct_ov49_022563D4 * unk_08; - UnkStruct_ov25_0225424C * unk_0C; + PoketchSystem * unk_0C; PoketchData * unk_10; } UnkStruct_ov49_0225621C; static void NitroStaticInit(void); -static BOOL ov49_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); -static BOOL ov49_0225621C(UnkStruct_ov49_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov49_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); +static BOOL ov49_0225621C(UnkStruct_ov49_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov49_02256258(UnkStruct_ov49_0225621C * param0); static void ov49_0225626C(SysTask * param0, void * param1); static void ov49_022562A0(void * param0); @@ -45,9 +44,9 @@ static void NitroStaticInit (void) ov25_02254238(ov49_022561D4, ov49_022562A0); } -static BOOL ov49_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov49_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov49_0225621C * v0 = (UnkStruct_ov49_0225621C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov49_0225621C)); + UnkStruct_ov49_0225621C * v0 = (UnkStruct_ov49_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov49_0225621C)); if (v0 != NULL) { if (ov49_0225621C(v0, param1, param2, param3)) { @@ -63,9 +62,9 @@ static BOOL ov49_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov49_0225621C (UnkStruct_ov49_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov49_0225621C (UnkStruct_ov49_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { - param0->unk_10 = ov25_02254540(param1); + param0->unk_10 = PoketchSystem_PoketchData(param1); param0->unk_04.unk_00 = PoketchData_CurrentScreenColor(param0->unk_10); param0->unk_03 = param0->unk_04.unk_00; diff --git a/src/overlay049/ov49_022563D4.c b/src/overlay049/ov49_022563D4.c index b75bea0306..9c172ac0be 100644 --- a/src/overlay049/ov49_022563D4.c +++ b/src/overlay049/ov49_022563D4.c @@ -17,7 +17,7 @@ #include "unk_02006E3C.h" #include "heap.h" #include "unk_02018340.h" -#include "overlay025/ov25_02253CE0.h" +#include "overlay025/poketch_system.h" #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -41,7 +41,7 @@ static void ov49_02256594(SysTask * param0, void * param1); BOOL ov49_022563D4 (UnkStruct_ov49_022563D4 ** param0, const UnkStruct_ov49_022563D4_1 * param1, BGL * param2) { - UnkStruct_ov49_022563D4 * v0 = (UnkStruct_ov49_022563D4 *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov49_022563D4)); + UnkStruct_ov49_022563D4 * v0 = (UnkStruct_ov49_022563D4 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov49_022563D4)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); diff --git a/src/overlay050/ov50_022561C0.c b/src/overlay050/ov50_022561C0.c index bccaf4a871..9482ce29dd 100644 --- a/src/overlay050/ov50_022561C0.c +++ b/src/overlay050/ov50_022561C0.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_02255B34_decl.h" #include "overlay050/struct_ov50_02256510_decl.h" @@ -15,7 +15,6 @@ #include "rtc.h" #include "heap.h" #include "poketch_data.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay025/ov25_02255ACC.h" #include "overlay050/ov50_02256510.h" @@ -25,7 +24,7 @@ typedef struct { u8 unk_02; UnkStruct_ov50_02256510_1 unk_04; UnkStruct_ov50_02256510 * unk_90; - UnkStruct_ov25_0225424C * unk_94; + PoketchSystem * unk_94; PoketchData * unk_98; UnkStruct_ov25_02255B34 * unk_9C; u32 unk_A0; @@ -36,8 +35,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov50_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); -static BOOL ov50_0225621C(UnkStruct_ov50_022561D4 * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov50_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); +static BOOL ov50_0225621C(UnkStruct_ov50_022561D4 * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov50_022562AC(UnkStruct_ov50_02256510_1 * param0, UnkStruct_ov50_022561D4 * param1, const RTCDate * param2); static void ov50_02256340(UnkStruct_ov50_022561D4 * param0); static void ov50_02256360(u32 param0, u32 param1, u32 param2, void * param3); @@ -53,9 +52,9 @@ static void NitroStaticInit (void) ov25_02254238(ov50_022561D4, ov50_022563B0); } -static BOOL ov50_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov50_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov50_022561D4 * v0 = (UnkStruct_ov50_022561D4 *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov50_022561D4)); + UnkStruct_ov50_022561D4 * v0 = (UnkStruct_ov50_022561D4 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov50_022561D4)); if (v0 != NULL) { if (ov50_0225621C(v0, param1, param2, param3)) { @@ -71,7 +70,7 @@ static BOOL ov50_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov50_0225621C (UnkStruct_ov50_022561D4 * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov50_0225621C (UnkStruct_ov50_022561D4 * param0, PoketchSystem * param1, BGL * param2, u32 param3) { static const UnkUnion_020225E0 v0[] = { {((5 + 3 * 0) * 8), ((5 + 3 * 0 + 2) * 8), ((4 + 3 * 0) * 8), ((4 + 3 * 0 + 2) * 8)}, @@ -115,7 +114,7 @@ static BOOL ov50_0225621C (UnkStruct_ov50_022561D4 * param0, UnkStruct_ov25_0225 RTCDate v1; GetCurrentDate(&v1); - param0->unk_98 = ov25_02254540(param1); + param0->unk_98 = PoketchSystem_PoketchData(param1); ov50_022562AC(&(param0->unk_04), param0, &v1); param0->unk_A8 = param0->unk_04.unk_0C[0].unk_02; diff --git a/src/overlay050/ov50_02256510.c b/src/overlay050/ov50_02256510.c index 03421d1e3c..3d3b03b9fc 100644 --- a/src/overlay050/ov50_02256510.c +++ b/src/overlay050/ov50_02256510.c @@ -46,7 +46,7 @@ static void ov50_02256894(BGL * param0, u32 param1, u32 param2); BOOL ov50_02256510 (UnkStruct_ov50_02256510 ** param0, const UnkStruct_ov50_02256510_1 * param1, BGL * param2) { - UnkStruct_ov50_02256510 * v0 = (UnkStruct_ov50_02256510 *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov50_02256510)); + UnkStruct_ov50_02256510 * v0 = (UnkStruct_ov50_02256510 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov50_02256510)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); diff --git a/src/overlay051/ov51_022561C0.c b/src/overlay051/ov51_022561C0.c index 4fd1fa5c70..ed8cde9b18 100644 --- a/src/overlay051/ov51_022561C0.c +++ b/src/overlay051/ov51_022561C0.c @@ -4,14 +4,13 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay051/struct_ov51_0225632C_decl.h" #include "overlay051/struct_ov51_0225632C_1.h" #include "unk_0200D9E8.h" #include "heap.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay051/ov51_0225632C.h" typedef struct { @@ -20,15 +19,15 @@ typedef struct { u8 unk_02; UnkStruct_ov51_0225632C_1 unk_04; UnkStruct_ov51_0225632C * unk_08; - UnkStruct_ov25_0225424C * unk_0C; + PoketchSystem * unk_0C; } UnkStruct_ov51_0225621C; static void NitroStaticInit(void); -static BOOL ov51_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov51_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov51_02256254(SysTask * param0, void * param1); static void ov51_02256288(void * param0); -static BOOL ov51_0225621C(UnkStruct_ov51_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov51_0225621C(UnkStruct_ov51_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov51_02256240(UnkStruct_ov51_0225621C * param0); static void ov51_02256290(UnkStruct_ov51_0225621C * param0, u32 param1); static BOOL ov51_022562A4(UnkStruct_ov51_0225621C * param0); @@ -40,9 +39,9 @@ static void NitroStaticInit (void) ov25_02254238(ov51_022561D4, ov51_02256288); } -static BOOL ov51_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov51_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov51_0225621C * v0 = (UnkStruct_ov51_0225621C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov51_0225621C)); + UnkStruct_ov51_0225621C * v0 = (UnkStruct_ov51_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov51_0225621C)); if (v0 != NULL) { if (ov51_0225621C(v0, param1, param2, param3)) { @@ -58,7 +57,7 @@ static BOOL ov51_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov51_0225621C (UnkStruct_ov51_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov51_0225621C (UnkStruct_ov51_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { if (ov51_0225632C(&(param0->unk_08), &(param0->unk_04), param2)) { param0->unk_00 = 0; diff --git a/src/overlay051/ov51_0225632C.c b/src/overlay051/ov51_0225632C.c index 1de50d0754..27963b1989 100644 --- a/src/overlay051/ov51_0225632C.c +++ b/src/overlay051/ov51_0225632C.c @@ -29,7 +29,7 @@ static void ov51_02256458(SysTask * param0, void * param1); BOOL ov51_0225632C (UnkStruct_ov51_0225632C ** param0, const UnkStruct_ov51_0225632C_1 * param1, BGL * param2) { - UnkStruct_ov51_0225632C * v0 = (UnkStruct_ov51_0225632C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov51_0225632C)); + UnkStruct_ov51_0225632C * v0 = (UnkStruct_ov51_0225632C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov51_0225632C)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 8); diff --git a/src/overlay052/ov52_022561C0.c b/src/overlay052/ov52_022561C0.c index 8261d896da..c83f21100f 100644 --- a/src/overlay052/ov52_022561C0.c +++ b/src/overlay052/ov52_022561C0.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay052/struct_ov52_02256694_decl.h" #include "field/field_system.h" @@ -17,7 +17,6 @@ #include "communication_system.h" #include "unk_020366A0.h" #include "map_header.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay052/ov52_02256694.h" typedef struct { @@ -26,7 +25,7 @@ typedef struct { u8 unk_02; UnkStruct_ov52_02256694_1 unk_04; UnkStruct_ov52_02256694 * unk_14; - UnkStruct_ov25_0225424C * unk_18; + PoketchSystem * unk_18; u32 unk_1C; u8 unk_20; u8 unk_21; @@ -34,8 +33,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov52_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); -static BOOL ov52_0225621C(UnkStruct_ov52_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov52_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); +static BOOL ov52_0225621C(UnkStruct_ov52_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov52_0225624C(UnkStruct_ov52_0225621C * param0); static void ov52_02256260(SysTask * param0, void * param1); static void ov52_0225629C(void * param0); @@ -60,9 +59,9 @@ static void NitroStaticInit (void) ov25_02254238(ov52_022561D4, ov52_0225629C); } -static BOOL ov52_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov52_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov52_0225621C * v0 = (UnkStruct_ov52_0225621C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov52_0225621C)); + UnkStruct_ov52_0225621C * v0 = (UnkStruct_ov52_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov52_0225621C)); if (v0 != NULL) { if (ov52_0225621C(v0, param1, param2, param3)) { @@ -78,7 +77,7 @@ static BOOL ov52_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov52_0225621C (UnkStruct_ov52_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov52_0225621C (UnkStruct_ov52_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { if (ov52_02256694(&(param0->unk_14), &(param0->unk_04), param2)) { param0->unk_00 = 0; @@ -170,7 +169,7 @@ static BOOL ov52_022562F8 (UnkStruct_ov52_0225621C * param0) case 0: if (ov52_02256554(param0)) { if (ov52_02256684(param0)) { - FieldSystem * v0 = ov25_0225453C(param0->unk_18); + FieldSystem * v0 = PoketchSystem_FieldSystem(param0->unk_18); ov52_022567A4(param0->unk_14, 3); @@ -410,7 +409,7 @@ static void ov52_022565EC (UnkStruct_ov52_0225621C * param0) static void ov52_0225664C (UnkStruct_ov52_0225621C * param0) { if (param0->unk_20 == 0) { - sub_02037BC0(ov25_02254544(param0->unk_18)); + sub_02037BC0(PoketchSystem_SaveData(param0->unk_18)); param0->unk_20 = 1; } } diff --git a/src/overlay052/ov52_02256694.c b/src/overlay052/ov52_02256694.c index b548430c18..8ae0d6c3ca 100644 --- a/src/overlay052/ov52_02256694.c +++ b/src/overlay052/ov52_02256694.c @@ -24,7 +24,7 @@ #include "unk_02018340.h" #include "unk_0201D670.h" #include "strbuf.h" -#include "overlay025/ov25_02253CE0.h" +#include "overlay025/poketch_system.h" #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -61,7 +61,7 @@ static void ov52_02256C64(UnkStruct_ov52_02256694 * param0, const UnkStruct_ov52 BOOL ov52_02256694 (UnkStruct_ov52_02256694 ** param0, const UnkStruct_ov52_02256694_1 * param1, BGL * param2) { - UnkStruct_ov52_02256694 * v0 = (UnkStruct_ov52_02256694 *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov52_02256694)); + UnkStruct_ov52_02256694 * v0 = (UnkStruct_ov52_02256694 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov52_02256694)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); diff --git a/src/overlay053/ov53_022561C0.c b/src/overlay053/ov53_022561C0.c index 36c2d6b911..9cf3ffc1f1 100644 --- a/src/overlay053/ov53_022561C0.c +++ b/src/overlay053/ov53_022561C0.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" #include "field/field_system_decl.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_02255B34_decl.h" #include "overlay053/struct_ov53_02256420_decl.h" @@ -15,7 +15,6 @@ #include "unk_0200D9E8.h" #include "heap.h" #include "overlay006/ov6_022430C4.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay025/ov25_02255ACC.h" #include "overlay053/ov53_02256420.h" @@ -25,7 +24,7 @@ typedef struct { u8 unk_02; UnkStruct_ov53_02256420_1 unk_04; UnkStruct_ov53_02256420 * unk_2C; - UnkStruct_ov25_0225424C * unk_30; + PoketchSystem * unk_30; UnkStruct_ov25_02255B34 * unk_34; u32 unk_38; u32 unk_3C; @@ -33,8 +32,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov53_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); -static BOOL ov53_0225621C(UnkStruct_ov53_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov53_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); +static BOOL ov53_0225621C(UnkStruct_ov53_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov53_022562B8(UnkStruct_ov53_0225621C * param0); static void ov53_022562D0(SysTask * param0, void * param1); static void ov53_0225630C(void * param0); @@ -49,9 +48,9 @@ static void NitroStaticInit (void) ov25_02254238(ov53_022561D4, ov53_0225630C); } -static BOOL ov53_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov53_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov53_0225621C * v0 = (UnkStruct_ov53_0225621C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov53_0225621C)); + UnkStruct_ov53_0225621C * v0 = (UnkStruct_ov53_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov53_0225621C)); if (v0 != NULL) { if (ov53_0225621C(v0, param1, param2, param3)) { @@ -67,7 +66,7 @@ static BOOL ov53_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov53_0225621C (UnkStruct_ov53_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov53_0225621C (UnkStruct_ov53_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { static const UnkUnion_020225E0 v0[] = { { @@ -92,7 +91,7 @@ static BOOL ov53_0225621C (UnkStruct_ov53_0225621C * param0, UnkStruct_ov25_0225 FieldSystem * v1; int v2; - v1 = ov25_0225453C(param1); + v1 = PoketchSystem_FieldSystem(param1); param0->unk_04.unk_04 = ov6_02243140(v1); if (param0->unk_04.unk_04) { @@ -206,7 +205,7 @@ static BOOL ov53_02256370 (UnkStruct_ov53_0225621C * param0) FieldSystem * v0; int v1; - v0 = ov25_0225453C(param0->unk_30); + v0 = PoketchSystem_FieldSystem(param0->unk_30); param0->unk_04.unk_04 = ov6_02243140(v0); if (param0->unk_04.unk_04 == 0) { diff --git a/src/overlay053/ov53_02256420.c b/src/overlay053/ov53_02256420.c index d920926afb..0a7ea14952 100644 --- a/src/overlay053/ov53_02256420.c +++ b/src/overlay053/ov53_02256420.c @@ -19,7 +19,7 @@ #include "unk_02018340.h" #include "unk_0201D15C.h" #include "pokemon_icon.h" -#include "overlay025/ov25_02253CE0.h" +#include "overlay025/poketch_system.h" #include "overlay025/ov25_02254560.h" #include "overlay025/ov25_02255090.h" #include "overlay025/ov25_02255540.h" @@ -52,7 +52,7 @@ static void ov53_02256874(UnkStruct_ov25_022558C4 ** param0, u32 param1); BOOL ov53_02256420 (UnkStruct_ov53_02256420 ** param0, const UnkStruct_ov53_02256420_1 * param1, BGL * param2) { - UnkStruct_ov53_02256420 * v0 = (UnkStruct_ov53_02256420 *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov53_02256420)); + UnkStruct_ov53_02256420 * v0 = (UnkStruct_ov53_02256420 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov53_02256420)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); diff --git a/src/overlay054/ov54_022561C0.c b/src/overlay054/ov54_022561C0.c index eb30adea1c..00b7827084 100644 --- a/src/overlay054/ov54_022561C0.c +++ b/src/overlay054/ov54_022561C0.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_02255B34_decl.h" #include "overlay054/struct_ov54_0225642C_decl.h" @@ -14,7 +14,6 @@ #include "unk_0200D9E8.h" #include "heap.h" #include "poketch_data.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay025/ov25_02255ACC.h" #include "overlay054/ov54_0225642C.h" @@ -24,7 +23,7 @@ typedef struct { u8 unk_02; UnkStruct_ov54_0225642C_1 unk_04; UnkStruct_ov54_0225642C * unk_98; - UnkStruct_ov25_0225424C * unk_9C; + PoketchSystem * unk_9C; UnkStruct_ov25_02255B34 * unk_A0; u32 unk_A4; u32 unk_A8; @@ -32,8 +31,8 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov54_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); -static BOOL ov54_0225621C(UnkStruct_ov54_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov54_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); +static BOOL ov54_0225621C(UnkStruct_ov54_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov54_022562D4(UnkStruct_ov54_0225621C * param0); static void ov54_022562F4(SysTask * param0, void * param1); static void ov54_02256338(void * param0); @@ -48,9 +47,9 @@ static void NitroStaticInit (void) ov25_02254238(ov54_022561D4, ov54_02256338); } -static BOOL ov54_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov54_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov54_0225621C * v0 = (UnkStruct_ov54_0225621C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov54_0225621C)); + UnkStruct_ov54_0225621C * v0 = (UnkStruct_ov54_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov54_0225621C)); if (v0 != NULL) { if (ov54_0225621C(v0, param1, param2, param3)) { @@ -66,7 +65,7 @@ static BOOL ov54_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov54_0225621C (UnkStruct_ov54_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov54_0225621C (UnkStruct_ov54_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { static const UnkUnion_020225E0 v0[] = { { @@ -145,7 +144,7 @@ static BOOL ov54_0225621C (UnkStruct_ov54_0225621C * param0, UnkStruct_ov25_0225 PoketchData * v1; int v2; - v1 = ov25_02254540(param1); + v1 = PoketchSystem_PoketchData(param1); param0->unk_04.unk_90 = PoketchData_PokemonHistorySize(v1); for (v2 = 0; v2 < param0->unk_04.unk_90; v2++) { diff --git a/src/overlay054/ov54_0225642C.c b/src/overlay054/ov54_0225642C.c index 1c2ee37487..cb27791d9f 100644 --- a/src/overlay054/ov54_0225642C.c +++ b/src/overlay054/ov54_0225642C.c @@ -46,7 +46,7 @@ static void ov54_022566A8(UnkStruct_ov54_0225642C * param0); BOOL ov54_0225642C (UnkStruct_ov54_0225642C ** param0, const UnkStruct_ov54_0225642C_1 * param1, BGL * param2) { - UnkStruct_ov54_0225642C * v0 = (UnkStruct_ov54_0225642C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov54_0225642C)); + UnkStruct_ov54_0225642C * v0 = (UnkStruct_ov54_0225642C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov54_0225642C)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); diff --git a/src/overlay055/ov55_022561C0.c b/src/overlay055/ov55_022561C0.c index 7051790bc7..6e0b148141 100644 --- a/src/overlay055/ov55_022561C0.c +++ b/src/overlay055/ov55_022561C0.c @@ -4,14 +4,13 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/sys_task.h" -#include "overlay025/struct_ov25_0225424C_decl.h" +#include "overlay025/poketch_system.h" #include "overlay055/struct_ov55_0225632C_decl.h" #include "overlay055/struct_ov55_0225632C_1.h" #include "unk_0200D9E8.h" #include "heap.h" -#include "overlay025/ov25_02253CE0.h" #include "overlay055/ov55_0225632C.h" typedef struct { @@ -20,15 +19,15 @@ typedef struct { u8 unk_02; UnkStruct_ov55_0225632C_1 unk_04; UnkStruct_ov55_0225632C * unk_08; - UnkStruct_ov25_0225424C * unk_0C; + PoketchSystem * unk_0C; } UnkStruct_ov55_0225621C; static void NitroStaticInit(void); -static BOOL ov55_022561D4(void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov55_022561D4(void ** param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov55_02256254(SysTask * param0, void * param1); static void ov55_02256288(void * param0); -static BOOL ov55_0225621C(UnkStruct_ov55_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3); +static BOOL ov55_0225621C(UnkStruct_ov55_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3); static void ov55_02256240(UnkStruct_ov55_0225621C * param0); static void ov55_02256290(UnkStruct_ov55_0225621C * param0, u32 param1); static BOOL ov55_022562A4(UnkStruct_ov55_0225621C * param0); @@ -40,9 +39,9 @@ static void NitroStaticInit (void) ov25_02254238(ov55_022561D4, ov55_02256288); } -static BOOL ov55_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov55_022561D4 (void ** param0, PoketchSystem * param1, BGL * param2, u32 param3) { - UnkStruct_ov55_0225621C * v0 = (UnkStruct_ov55_0225621C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov55_0225621C)); + UnkStruct_ov55_0225621C * v0 = (UnkStruct_ov55_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov55_0225621C)); if (v0 != NULL) { if (ov55_0225621C(v0, param1, param2, param3)) { @@ -59,7 +58,7 @@ static BOOL ov55_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, BGL return 0; } -static BOOL ov55_0225621C (UnkStruct_ov55_0225621C * param0, UnkStruct_ov25_0225424C * param1, BGL * param2, u32 param3) +static BOOL ov55_0225621C (UnkStruct_ov55_0225621C * param0, PoketchSystem * param1, BGL * param2, u32 param3) { if (ov55_0225632C(&(param0->unk_08), &(param0->unk_04), param2)) { param0->unk_00 = 0; diff --git a/src/overlay055/ov55_0225632C.c b/src/overlay055/ov55_0225632C.c index 2778af85d1..20bb3b85f4 100644 --- a/src/overlay055/ov55_0225632C.c +++ b/src/overlay055/ov55_0225632C.c @@ -28,7 +28,7 @@ static void ov55_02256468(SysTask * param0, void * param1); BOOL ov55_0225632C (UnkStruct_ov55_0225632C ** param0, const UnkStruct_ov55_0225632C_1 * param1, BGL * param2) { - UnkStruct_ov55_0225632C * v0 = (UnkStruct_ov55_0225632C *)Heap_AllocFromHeap(8, sizeof(UnkStruct_ov55_0225632C)); + UnkStruct_ov55_0225632C * v0 = (UnkStruct_ov55_0225632C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov55_0225632C)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 8); diff --git a/src/unk_0203CC84.c b/src/unk_0203CC84.c index c79896a755..af6dfe77ba 100644 --- a/src/unk_0203CC84.c +++ b/src/unk_0203CC84.c @@ -6,7 +6,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "field/field_system_sub1_decl.h" #include "savedata.h" -#include "overlay025/struct_ov25_02253CE0_decl.h" +#include "overlay025/poketch_system.h" #include "overlay005/const_ov5_021F89B0.h" #include "overlay077/const_ov77_021D742C.h" @@ -38,7 +38,6 @@ #include "overlay005/ov5_021DFB54.h" #include "overlay005/ov5_021E1B08.h" #include "overlay005/ov5_021EA714.h" -#include "overlay025/ov25_02253CE0.h" FS_EXTERN_OVERLAY(overlay5); FS_EXTERN_OVERLAY(overlay77); @@ -317,7 +316,7 @@ void sub_0203CF5C (FieldSystem * param0) { BOOL v3 = 0; - UnkStruct_ov25_02253CE0 * v4 = sub_0203D158(); + PoketchSystem * v4 = sub_0203D158(); if (v4 != NULL) { v3 = ov25_02253DD4(v4); @@ -343,7 +342,7 @@ void sub_0203CF5C (FieldSystem * param0) { BOOL v5 = 0; - UnkStruct_ov25_02253CE0 * v6 = sub_0203D158(); + PoketchSystem * v6 = sub_0203D158(); if (v6 != NULL) { v5 = ov25_02253DD4(v6); @@ -369,7 +368,7 @@ void sub_0203D140 (void) CommSys_EnableSendMovementData(); } -struct UnkStruct_ov25_02253CE0_t * sub_0203D158 (void) +struct PoketchSystem * sub_0203D158 (void) { if (Unk_021C07DC->unk_04 == NULL) { return NULL; diff --git a/src/unk_02048DD8.c b/src/unk_02048DD8.c index 4469fec804..84bdf069a0 100644 --- a/src/unk_02048DD8.c +++ b/src/unk_02048DD8.c @@ -40,7 +40,7 @@ #include "party.h" #include "overlay006/ov6_022465FC.h" #include "overlay006/ov6_02246A30.h" -#include "overlay025/ov25_02253CE0.h" +#include "overlay025/poketch_system.h" typedef void (* UnkFuncPtr_020EBB48)(FieldSystem *, u16); typedef void (* UnkFuncPtr_020EBB48_1)(FieldSystem *, StringFormatter *); @@ -296,7 +296,7 @@ static void sub_02049288 (FieldSystem * param0, StringFormatter * param1) { int v0; - v0 = ov25_02253DD8(param0->unk_04->unk_14); + v0 = PoketchSystem_CurrentAppID(param0->unk_04->unk_14); sub_0200B928(param1, 0, v0); } diff --git a/src/unk_0206CCB0.c b/src/unk_0206CCB0.c index cc35c1def9..8b75c9ca81 100644 --- a/src/unk_0206CCB0.c +++ b/src/unk_0206CCB0.c @@ -68,7 +68,7 @@ #include "unk_02094EDC.h" #include "overlay006/ov6_02243218.h" #include "overlay006/ov6_02246444.h" -#include "overlay025/ov25_02253CE0.h" +#include "overlay025/poketch_system.h" static void sub_0206CD70(FieldSystem * param0, int param1, int param2, const void * param3); static void sub_0206CD7C(SaveData * param0, int param1, int param2, const void * param3); @@ -1696,7 +1696,7 @@ void sub_0206E264 (FieldSystem * param0, u16 param1) UnkUnion_0206D1B8 v0; UnkStruct_0206E28C * v1 = &v0.val28; - v1->unk_00 = ov25_02253DD8(param0->unk_04->unk_14); + v1->unk_00 = PoketchSystem_CurrentAppID(param0->unk_04->unk_14); v1->unk_04 = param1; sub_0206CD70(param0, 1, 6, v1);