From 1e43770d0a3d099e6b7ea22b68d6d0fe6e8490c7 Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Wed, 3 Apr 2024 19:40:34 -0400 Subject: [PATCH] v0, v1 --- include/overlay023/funcptr_ov23_02248D20.h | 2 +- include/overlay023/ov23_02248C08.h | 2 +- include/overlay023/ov23_0224F294.h | 2 +- include/overlay023/ov23_02253598.h | 6 +- include/overlay023/struct_ov23_02248D20.h | 2 +- include/struct_decls/struct_0202855C_decl.h | 2 +- include/struct_decls/struct_020298B0_decl.h | 2 +- include/struct_defs/struct_0202855C.h | 2 +- include/struct_defs/struct_02029894.h | 2 +- include/struct_defs/struct_020298B0.h | 2 +- include/unk_0202854C.h | 196 +++++++------- include/unk_0203CC84.h | 2 +- include/unk_0205E7D0.h | 2 +- src/field_comm_manager.c | 4 +- src/overlay005/ov5_021D0D80.c | 6 +- src/overlay005/ov5_021D1C30.c | 2 +- src/overlay005/ov5_021F8370.c | 4 +- src/overlay006/ov6_02240C9C.c | 8 +- src/overlay006/ov6_02242984.c | 2 +- src/overlay006/ov6_02242AF0.c | 6 +- src/overlay006/ov6_02247A0C.c | 2 +- src/overlay007/ov7_02249960.c | 2 +- src/overlay008/ov8_02249960.c | 36 +-- src/overlay009/ov9_02249960.c | 12 +- src/overlay023/ov23_0223E140.c | 30 +-- src/overlay023/ov23_022416A8.c | 8 +- src/overlay023/ov23_02241F74.c | 6 +- src/overlay023/ov23_0224340C.c | 24 +- src/overlay023/ov23_02248C08.c | 2 +- src/overlay023/ov23_022499E4.c | 2 +- src/overlay023/ov23_0224A1D0.c | 12 +- src/overlay023/ov23_0224B05C.c | 12 +- src/overlay023/ov23_0224DC40.c | 4 +- src/overlay023/ov23_0224F294.c | 32 +-- src/overlay023/ov23_0225128C.c | 10 +- src/overlay023/ov23_022521F0.c | 12 +- src/overlay023/ov23_02253598.c | 22 +- src/overlay023/ov23_022542CC.c | 6 +- src/overlay023/ov23_02254A14.c | 8 +- src/overlay118/ov118_021D0D80.c | 2 +- src/unk_0202854C.c | 238 ++++++++-------- src/unk_0203CC84.c | 2 +- src/unk_0203D1B8.c | 12 +- src/unk_0203F6C4.c | 22 +- src/unk_02046C7C.c | 2 +- src/unk_020474B8.c | 4 +- src/unk_020494DC.c | 2 +- src/unk_02049D08.c | 2 +- src/unk_0204C6C8.c | 4 +- src/unk_0204C8F0.c | 10 +- src/unk_0204CA84.c | 2 +- src/unk_0204CFFC.c | 2 +- src/unk_0204E974.c | 10 +- src/unk_0204EDA4.c | 2 +- src/unk_020528D0.c | 2 +- src/unk_020559DC.c | 2 +- src/unk_02057518.c | 285 ++++++++++---------- src/unk_0205B33C.c | 2 +- src/unk_0205E7D0.c | 2 +- src/unk_0205F180.c | 4 +- src/unk_02068344.c | 6 +- src/unk_0206B70C.c | 2 +- src/unk_0206B9D8.c | 2 +- src/unk_0206CCB0.c | 4 +- src/unk_0207160C.c | 8 +- src/unk_02071B10.c | 18 +- src/unk_02071CD0.c | 2 +- src/unk_02071D40.c | 8 +- src/unk_020722AC.c | 10 +- src/unk_02098218.c | 8 +- src/unk_02099604.c | 4 +- 71 files changed, 587 insertions(+), 596 deletions(-) diff --git a/include/overlay023/funcptr_ov23_02248D20.h b/include/overlay023/funcptr_ov23_02248D20.h index 29b8b259ca..07467122db 100644 --- a/include/overlay023/funcptr_ov23_02248D20.h +++ b/include/overlay023/funcptr_ov23_02248D20.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_020298B0_decl.h" -typedef void (* UnkFuncPtr_ov23_02248D20)(UnkStruct_020298B0 *, int, int); +typedef void (* UnkFuncPtr_ov23_02248D20)(UndergroundData *, int, int); #endif // POKEPLATINUM_FUNCPTR_OV23_02248D20_H diff --git a/include/overlay023/ov23_02248C08.h b/include/overlay023/ov23_02248C08.h index 27de2f2fcd..f3d12a57cc 100644 --- a/include/overlay023/ov23_02248C08.h +++ b/include/overlay023/ov23_02248C08.h @@ -6,7 +6,7 @@ #include "overlay023/struct_ov23_02248D20.h" #include "overlay084/struct_ov84_02240FA8.h" -UnkStruct_ov23_02248D20 * ov23_02248C08(UnkStruct_ov84_02240FA8 * param0, u16 param1, u16 param2, u8 param3, UnkFuncPtr_ov23_02248D20 param4, UnkStruct_020298B0 * param5, BOOL param6); +UnkStruct_ov23_02248D20 * ov23_02248C08(UnkStruct_ov84_02240FA8 * param0, u16 param1, u16 param2, u8 param3, UnkFuncPtr_ov23_02248D20 param4, UndergroundData * param5, BOOL param6); u32 ov23_02248D20(UnkStruct_ov23_02248D20 * param0); void ov23_02248EF8(UnkStruct_ov23_02248D20 * param0, u16 * param1, u16 * param2); diff --git a/include/overlay023/ov23_0224F294.h b/include/overlay023/ov23_0224F294.h index 9749587394..e30fc3f4b8 100644 --- a/include/overlay023/ov23_0224F294.h +++ b/include/overlay023/ov23_0224F294.h @@ -8,7 +8,7 @@ #include "overlay023/funcptr_ov23_0224F758.h" #include "overlay023/struct_ov23_02250CD4.h" -void ov23_0224F588(UnkStruct_020298B0 * param0); +void ov23_0224F588(UndergroundData * param0); void ov23_0224F5B8(void); int ov23_0224F5F0(int param0, void * param1); int ov23_0224F61C(int param0, void * param1); diff --git a/include/overlay023/ov23_02253598.h b/include/overlay023/ov23_02253598.h index 93b1b76647..2b261eff6f 100644 --- a/include/overlay023/ov23_02253598.h +++ b/include/overlay023/ov23_02253598.h @@ -9,7 +9,7 @@ #include "overlay023/struct_ov23_02253598_decl.h" #include "overlay023/funcptr_ov23_02253834.h" -void ov23_02253598(UnkStruct_ov23_02253598 * param0, UnkStruct_0202855C * param1, SaveData * param2); +void ov23_02253598(UnkStruct_ov23_02253598 * param0, SecretBaseRecord * param1, SaveData * param2); void ov23_022535CC(void); void ov23_022535EC(void); void ov23_02253604(void); @@ -21,8 +21,8 @@ void ov23_02253998(int param0, int param1, void * param2, void * param3); void ov23_022539A8(int param0, int param1, void * param2, void * param3); BOOL ov23_022539D8(void); void ov23_022539E8(void); -void ov23_02253A00(UnkStruct_0202855C * param0, int param1); -void * ov23_02253C64(BGL * param0, TrainerInfo * param1, UnkStruct_020298B0 * param2, UnkFuncPtr_ov23_02253834 param3, void * param4); +void ov23_02253A00(SecretBaseRecord * param0, int param1); +void * ov23_02253C64(BGL * param0, TrainerInfo * param1, UndergroundData * param2, UnkFuncPtr_ov23_02253834 param3, void * param4); void ov23_02253D10(void * param0); #endif // POKEPLATINUM_OV23_02253598_H diff --git a/include/overlay023/struct_ov23_02248D20.h b/include/overlay023/struct_ov23_02248D20.h index 38752a354a..b3f6de5e99 100644 --- a/include/overlay023/struct_ov23_02248D20.h +++ b/include/overlay023/struct_ov23_02248D20.h @@ -9,7 +9,7 @@ typedef struct { UnkFuncPtr_ov23_02248D20 unk_00; - UnkStruct_020298B0 * unk_04; + UndergroundData * unk_04; ResourceMetadata * unk_08; UnkStruct_0200112C * unk_0C; UnkStruct_020149F0 * unk_10; diff --git a/include/struct_decls/struct_0202855C_decl.h b/include/struct_decls/struct_0202855C_decl.h index 22c51a37b1..0aeab3e6f4 100644 --- a/include/struct_decls/struct_0202855C_decl.h +++ b/include/struct_decls/struct_0202855C_decl.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_0202855C_DECL_H #define POKEPLATINUM_STRUCT_0202855C_DECL_H -typedef struct UnkStruct_0202855C_t UnkStruct_0202855C; +typedef struct UnkStruct_0202855C_t SecretBaseRecord; #endif // POKEPLATINUM_STRUCT_0202855C_DECL_H diff --git a/include/struct_decls/struct_020298B0_decl.h b/include/struct_decls/struct_020298B0_decl.h index bdde1dbbef..19b2add53f 100644 --- a/include/struct_decls/struct_020298B0_decl.h +++ b/include/struct_decls/struct_020298B0_decl.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_020298B0_DECL_H #define POKEPLATINUM_STRUCT_020298B0_DECL_H -typedef struct UnkStruct_020298B0_t UnkStruct_020298B0; +typedef struct UnkStruct_020298B0_t UndergroundData; #endif // POKEPLATINUM_STRUCT_020298B0_DECL_H diff --git a/include/struct_defs/struct_0202855C.h b/include/struct_defs/struct_0202855C.h index 472d8e1169..1e029a7cfb 100644 --- a/include/struct_defs/struct_0202855C.h +++ b/include/struct_defs/struct_0202855C.h @@ -17,6 +17,6 @@ typedef struct UnkStruct_0202855C_t { u32 unk_30_0 : 20; u32 unk_34_0 : 20; u32 unk_38_0 : 20; -} UnkStruct_0202855C; +} SecretBaseRecord; #endif // POKEPLATINUM_STRUCT_0202855C_H diff --git a/include/struct_defs/struct_02029894.h b/include/struct_defs/struct_02029894.h index c2020cd318..fac72a718c 100644 --- a/include/struct_defs/struct_02029894.h +++ b/include/struct_defs/struct_02029894.h @@ -8,7 +8,7 @@ typedef struct UnkStruct_02029894_t { UnkStruct_02029894_sub1 unk_00[15]; UnkStruct_02029894_sub2 unk_2D[16]; - UnkStruct_0202855C unk_50; + SecretBaseRecord unk_50; u16 unk_8C; u16 unk_8E; u8 unk_90; diff --git a/include/struct_defs/struct_020298B0.h b/include/struct_defs/struct_020298B0.h index 367be5988a..c1d8da770e 100644 --- a/include/struct_defs/struct_020298B0.h +++ b/include/struct_defs/struct_020298B0.h @@ -36,6 +36,6 @@ typedef struct UnkStruct_020298B0_t { u8 unk_9AB; u8 unk_9AC_0 : 4; u8 unk_9AC_4 : 4; -} UnkStruct_020298B0; +} UndergroundData; #endif // POKEPLATINUM_STRUCT_020298B0_H diff --git a/include/unk_0202854C.h b/include/unk_0202854C.h index 7ba512ccf6..8be644178a 100644 --- a/include/unk_0202854C.h +++ b/include/unk_0202854C.h @@ -10,78 +10,78 @@ int Underground_SaveSize(void); int sub_02028554(void); int sub_02028558(void); -UnkStruct_0202855C * sub_0202855C(u32 param0); -void Underground_Init(UnkStruct_020298B0 * param0); +SecretBaseRecord * sub_0202855C(u32 param0); +void Underground_Init(UndergroundData * param0); void sub_02028658(SaveData * param0, int param1); void sub_02028758(SaveData * param0, s32 param1, BOOL param2); void sub_0202878C(SaveData * param0); void sub_020287E0(SaveData * param0); void sub_020287F8(SaveData * param0); BOOL sub_02028810(SaveData * param0); -void sub_02028828(UnkStruct_020298B0 * param0); -void sub_02028830(UnkStruct_020298B0 * param0, const TrainerInfo * param1); -TrainerInfo * sub_020288C8(const UnkStruct_020298B0 * param0, int param1, int param2); -u32 sub_02028930(UnkStruct_020298B0 * param0); +void sub_02028828(UndergroundData * param0); +void sub_02028830(UndergroundData * param0, const TrainerInfo * param1); +TrainerInfo * sub_020288C8(const UndergroundData * param0, int param1, int param2); +u32 sub_02028930(UndergroundData * param0); int sub_02028938(int param0); -BOOL sub_0202895C(UnkStruct_020298B0 * param0, int param1); -BOOL sub_02028984(UnkStruct_020298B0 * param0, int param1); -int sub_020289A0(UnkStruct_020298B0 * param0); -int sub_020289B8(UnkStruct_020298B0 * param0, int param1); -int sub_020289C4(UnkStruct_020298B0 * param0, int param1); -void sub_02028A10(UnkStruct_020298B0 * param0, int param1, int param2); -int sub_02028ACC(UnkStruct_020298B0 * param0, int param1, int param2); -BOOL sub_02028AFC(UnkStruct_020298B0 * param0, int param1); -void sub_02028B20(UnkStruct_020298B0 * param0, int param1); -void sub_02028B34(UnkStruct_020298B0 * param0); -int sub_02028B70(UnkStruct_020298B0 * param0); -int sub_02028B88(UnkStruct_020298B0 * param0, int param1); -int sub_02028B94(UnkStruct_020298B0 * param0, int param1); -BOOL sub_02028BC8(UnkStruct_020298B0 * param0, int param1); -void sub_02028BE8(UnkStruct_020298B0 * param0, int param1, int param2); -int sub_02028C3C(UnkStruct_020298B0 * param0); -int sub_02028C54(UnkStruct_020298B0 * param0, int param1); -int sub_02028C60(UnkStruct_020298B0 * param0, int param1); -int sub_02028C6C(UnkStruct_020298B0 * param0, int param1); -BOOL sub_02028CB0(UnkStruct_020298B0 * param0, int param1, int param2); -void sub_02028CD8(UnkStruct_020298B0 * param0, int param1, int param2); -int sub_02028D58(UnkStruct_020298B0 * param0); -int sub_02028D74(UnkStruct_020298B0 * param0, int param1); -int sub_02028D80(UnkStruct_020298B0 * param0, int param1); -BOOL sub_02028DB4(UnkStruct_020298B0 * param0, int param1); -void sub_02028DD8(UnkStruct_020298B0 * param0, int param1, int param2); -int sub_02028E28(UnkStruct_020298B0 * param0); -int sub_02028E44(UnkStruct_020298B0 * param0, int param1); -int sub_02028E50(UnkStruct_020298B0 * param0, int param1); -BOOL sub_02028E84(UnkStruct_020298B0 * param0, int param1); -void sub_02028EA8(UnkStruct_020298B0 * param0, int param1, int param2); -void sub_02028EF8(UnkStruct_020298B0 * param0, int param1, int param2, int param3, int param4); -int sub_02028F40(UnkStruct_020298B0 * param0, int param1); -int sub_02028F5C(UnkStruct_020298B0 * param0, int param1); -int sub_02028F88(UnkStruct_020298B0 * param0, int param1); -void sub_02028FB4(UnkStruct_020298B0 * param0, int param1); -void sub_02028FE0(UnkStruct_020298B0 * param0, int param1, int param2, int param3, int param4, int param5); -int sub_02029030(UnkStruct_020298B0 * param0, int param1); -int sub_0202903C(UnkStruct_020298B0 * param0, int param1); -int sub_0202905C(UnkStruct_020298B0 * param0, int param1); -int sub_0202907C(UnkStruct_020298B0 * param0, int param1); -void sub_02029088(UnkStruct_020298B0 * param0, int param1, int param2, int param3, int param4, int param5, int param6); -int sub_020290DC(UnkStruct_020298B0 * param0, int param1); -int sub_020290E8(UnkStruct_020298B0 * param0, int param1); -int sub_02029108(UnkStruct_020298B0 * param0, int param1); -int sub_02029128(UnkStruct_020298B0 * param0, int param1); -int sub_02029134(UnkStruct_020298B0 * param0, int param1); -int sub_02029140(UnkStruct_020298B0 * param0, int param1, int param2); -void sub_020291A4(UnkStruct_020298B0 * param0, int param1); -int sub_020291CC(UnkStruct_020298B0 * param0, int param1); -int sub_020291EC(UnkStruct_020298B0 * param0, int param1); -BOOL sub_0202920C(UnkStruct_020298B0 * param0); -void sub_02029220(UnkStruct_020298B0 * param0); -BOOL sub_02029234(UnkStruct_020298B0 * param0); -void sub_02029240(UnkStruct_020298B0 * param0); -void sub_02029250(UnkStruct_020298B0 * param0, int param1); -BOOL sub_02029274(UnkStruct_020298B0 * param0, int param1); -void sub_0202929C(UnkStruct_020298B0 * param0); -int sub_020292B4(UnkStruct_020298B0 * param0); +BOOL sub_0202895C(UndergroundData * param0, int param1); +BOOL sub_02028984(UndergroundData * param0, int param1); +int sub_020289A0(UndergroundData * param0); +int sub_020289B8(UndergroundData * param0, int param1); +int sub_020289C4(UndergroundData * param0, int param1); +void sub_02028A10(UndergroundData * param0, int param1, int param2); +int sub_02028ACC(UndergroundData * param0, int param1, int param2); +BOOL sub_02028AFC(UndergroundData * param0, int param1); +void sub_02028B20(UndergroundData * param0, int param1); +void sub_02028B34(UndergroundData * param0); +int sub_02028B70(UndergroundData * param0); +int sub_02028B88(UndergroundData * param0, int param1); +int sub_02028B94(UndergroundData * param0, int param1); +BOOL sub_02028BC8(UndergroundData * param0, int param1); +void sub_02028BE8(UndergroundData * param0, int param1, int param2); +int sub_02028C3C(UndergroundData * param0); +int sub_02028C54(UndergroundData * param0, int param1); +int sub_02028C60(UndergroundData * param0, int param1); +int sub_02028C6C(UndergroundData * param0, int param1); +BOOL sub_02028CB0(UndergroundData * param0, int param1, int param2); +void sub_02028CD8(UndergroundData * param0, int param1, int param2); +int sub_02028D58(UndergroundData * param0); +int sub_02028D74(UndergroundData * param0, int param1); +int sub_02028D80(UndergroundData * param0, int param1); +BOOL sub_02028DB4(UndergroundData * param0, int param1); +void sub_02028DD8(UndergroundData * param0, int param1, int param2); +int sub_02028E28(UndergroundData * param0); +int sub_02028E44(UndergroundData * param0, int param1); +int sub_02028E50(UndergroundData * param0, int param1); +BOOL sub_02028E84(UndergroundData * param0, int param1); +void sub_02028EA8(UndergroundData * param0, int param1, int param2); +void sub_02028EF8(UndergroundData * param0, int param1, int param2, int param3, int param4); +int sub_02028F40(UndergroundData * param0, int param1); +int sub_02028F5C(UndergroundData * param0, int param1); +int sub_02028F88(UndergroundData * param0, int param1); +void sub_02028FB4(UndergroundData * param0, int param1); +void sub_02028FE0(UndergroundData * param0, int param1, int param2, int param3, int param4, int param5); +int sub_02029030(UndergroundData * param0, int param1); +int sub_0202903C(UndergroundData * param0, int param1); +int sub_0202905C(UndergroundData * param0, int param1); +int sub_0202907C(UndergroundData * param0, int param1); +void sub_02029088(UndergroundData * param0, int param1, int param2, int param3, int param4, int param5, int param6); +int sub_020290DC(UndergroundData * param0, int param1); +int sub_020290E8(UndergroundData * param0, int param1); +int sub_02029108(UndergroundData * param0, int param1); +int sub_02029128(UndergroundData * param0, int param1); +int sub_02029134(UndergroundData * param0, int param1); +int sub_02029140(UndergroundData * param0, int param1, int param2); +void sub_020291A4(UndergroundData * param0, int param1); +int sub_020291CC(UndergroundData * param0, int param1); +int sub_020291EC(UndergroundData * param0, int param1); +BOOL sub_0202920C(UndergroundData * param0); +void sub_02029220(UndergroundData * param0); +BOOL sub_02029234(UndergroundData * param0); +void sub_02029240(UndergroundData * param0); +void sub_02029250(UndergroundData * param0, int param1); +BOOL sub_02029274(UndergroundData * param0, int param1); +void sub_0202929C(UndergroundData * param0); +int sub_020292B4(UndergroundData * param0); void sub_020292C0(UnkStruct_02029894 * param0); void sub_020292CC(UnkStruct_02029894 * param0); void sub_02029300(UnkStruct_02029894 * param0); @@ -92,44 +92,44 @@ int sub_020293FC(const UnkStruct_02029894 * param0, int param1); int sub_0202942C(const UnkStruct_02029894 * param0, int param1); int sub_02029460(const UnkStruct_02029894 * param0); int sub_0202948C(const UnkStruct_02029894 * param0); -int sub_020294B8(const UnkStruct_0202855C * param0); -int sub_020294C0(const UnkStruct_0202855C * param0); -void sub_020294D4(UnkStruct_0202855C * param0, int param1); -int sub_020294EC(const UnkStruct_0202855C * param0); -void sub_020294F4(UnkStruct_0202855C * param0, int param1); -int sub_02029524(const UnkStruct_0202855C * param0); -void sub_0202952C(UnkStruct_0202855C * param0); -void sub_0202955C(UnkStruct_0202855C * param0); -int sub_0202958C(const UnkStruct_0202855C * param0); -int sub_020295B8(const UnkStruct_0202855C * param0); -void sub_020295C0(UnkStruct_0202855C * param0); -int sub_020295F0(const UnkStruct_0202855C * param0); -void sub_020295F8(UnkStruct_0202855C * param0, int param1); -int sub_0202963C(const UnkStruct_0202855C * param0); -void sub_02029644(UnkStruct_0202855C * param0, int param1); -void sub_02029688(UnkStruct_0202855C * param0, int param1); -int sub_020296CC(const UnkStruct_0202855C * param0); -void sub_020296D4(UnkStruct_0202855C * param0); -int sub_02029704(const UnkStruct_0202855C * param0); -void sub_0202970C(UnkStruct_0202855C * param0); -int sub_0202973C(const UnkStruct_0202855C * param0); -void sub_02029744(UnkStruct_0202855C * param0); -int sub_02029774(const UnkStruct_0202855C * param0); -void sub_0202977C(UnkStruct_0202855C * param0); -int sub_020297AC(const UnkStruct_0202855C * param0); -void sub_020297B4(UnkStruct_0202855C * param0); -int sub_020297E4(const UnkStruct_0202855C * param0); -void sub_020297EC(UnkStruct_0202855C * param0); -int sub_0202981C(const UnkStruct_0202855C * param0); -void sub_02029824(UnkStruct_0202855C * param0); +int sub_020294B8(const SecretBaseRecord * param0); +int sub_020294C0(const SecretBaseRecord * param0); +void sub_020294D4(SecretBaseRecord * param0, int param1); +int sub_020294EC(const SecretBaseRecord * param0); +void sub_020294F4(SecretBaseRecord * param0, int param1); +int sub_02029524(const SecretBaseRecord * param0); +void sub_0202952C(SecretBaseRecord * param0); +void sub_0202955C(SecretBaseRecord * param0); +int sub_0202958C(const SecretBaseRecord * param0); +int sub_020295B8(const SecretBaseRecord * param0); +void sub_020295C0(SecretBaseRecord * param0); +int sub_020295F0(const SecretBaseRecord * param0); +void sub_020295F8(SecretBaseRecord * param0, int param1); +int sub_0202963C(const SecretBaseRecord * param0); +void sub_02029644(SecretBaseRecord * param0, int param1); +void sub_02029688(SecretBaseRecord * param0, int param1); +int sub_020296CC(const SecretBaseRecord * param0); +void sub_020296D4(SecretBaseRecord * param0); +int sub_02029704(const SecretBaseRecord * param0); +void sub_0202970C(SecretBaseRecord * param0); +int sub_0202973C(const SecretBaseRecord * param0); +void sub_02029744(SecretBaseRecord * param0); +int sub_02029774(const SecretBaseRecord * param0); +void sub_0202977C(SecretBaseRecord * param0); +int sub_020297AC(const SecretBaseRecord * param0); +void sub_020297B4(SecretBaseRecord * param0); +int sub_020297E4(const SecretBaseRecord * param0); +void sub_020297EC(SecretBaseRecord * param0); +int sub_0202981C(const SecretBaseRecord * param0); +void sub_02029824(SecretBaseRecord * param0); void sub_02029854(UnkStruct_02029894 * param0, int param1, int param2, int param3); int sub_02029874(const UnkStruct_02029894 * param0); int sub_0202987C(const UnkStruct_02029894 * param0); int sub_02029884(const UnkStruct_02029894 * param0); BOOL sub_0202988C(const UnkStruct_02029894 * param0); UnkStruct_02029894 * sub_02029894(SaveData * param0); -UnkStruct_0202855C * sub_020298A0(SaveData * param0); -UnkStruct_0202855C * sub_020298AC(UnkStruct_02029894 * param0); -UnkStruct_020298B0 * sub_020298B0(SaveData * param0); +SecretBaseRecord * SaveData_SecretBaseRecord(SaveData * param0); +SecretBaseRecord * sub_020298AC(UnkStruct_02029894 * param0); +UndergroundData * sub_020298B0(SaveData * param0); #endif // POKEPLATINUM_UNK_0202854C_H diff --git a/include/unk_0203CC84.h b/include/unk_0203CC84.h index 7a01954e60..34be39a657 100644 --- a/include/unk_0203CC84.h +++ b/include/unk_0203CC84.h @@ -17,6 +17,6 @@ void sub_0203D128(void); void sub_0203D140(void); UnkStruct_ov25_02253CE0 * sub_0203D158(void); BGL * sub_0203D170(void * param0); -SaveData * sub_0203D174(void * param0); +SaveData * FieldSystem_SaveData(void * param0); #endif // POKEPLATINUM_UNK_0203CC84_H diff --git a/include/unk_0205E7D0.h b/include/unk_0205E7D0.h index 09d0dca37e..28e005d3e8 100644 --- a/include/unk_0205E7D0.h +++ b/include/unk_0205E7D0.h @@ -29,7 +29,7 @@ const VecFx32 * sub_0205EAFC(PlayerAvatar * const param0); void sub_0205EB08(PlayerAvatar * param0, int param1); int sub_0205EB0C(const PlayerAvatar * param0); void sub_0205EB10(PlayerAvatar * param0, int param1); -int sub_0205EB14(const PlayerAvatar * param0); +int Player_MoveState(const PlayerAvatar * param0); void sub_0205EB18(PlayerAvatar * param0, int param1); void sub_0205EB38(PlayerAvatar * param0, LocalMapObject * param1); LocalMapObject * Player_LocalMapObject(PlayerAvatar * param0); diff --git a/src/field_comm_manager.c b/src/field_comm_manager.c index e82d3a2599..adca18272b 100644 --- a/src/field_comm_manager.c +++ b/src/field_comm_manager.c @@ -123,7 +123,7 @@ void FieldCommMan_StartBattleServer (FieldSystem * fieldSys, int param1, int par return; } - CommMan_StartBattleServer(sub_0203D174(fieldSys), param1, param2, fieldSys->unk_B0, 0); + CommMan_StartBattleServer(FieldSystem_SaveData(fieldSys), param1, param2, fieldSys->unk_B0, 0); FieldCommMan_Init(fieldSys); FieldCommMan_SetTask(Task_StartBattleServer, 0); } @@ -134,7 +134,7 @@ void FieldCommMan_StartBattleClient (FieldSystem * fieldSys, int param1, int par return; } - CommMan_StartBattleClient(sub_0203D174(fieldSys), param1, param2, fieldSys->unk_B0, 0); + CommMan_StartBattleClient(FieldSystem_SaveData(fieldSys), param1, param2, fieldSys->unk_B0, 0); FieldCommMan_Init(fieldSys); FieldCommMan_SetTask(Task_StartBattleClient, 0); } diff --git a/src/overlay005/ov5_021D0D80.c b/src/overlay005/ov5_021D0D80.c index 1129f73bff..a6040d4a4b 100644 --- a/src/overlay005/ov5_021D0D80.c +++ b/src/overlay005/ov5_021D0D80.c @@ -382,7 +382,7 @@ const UnkStruct_0208BE5C Unk_ov5_021F89B0 = { static int ov5_021D1178 (FieldSystem * param0) { - UnkStruct_02027860 * v0 = sub_02027860(sub_0203D174(param0)); + UnkStruct_02027860 * v0 = sub_02027860(FieldSystem_SaveData(param0)); int v1 = sub_02027F80(v0); if (v1 == 0) { @@ -906,7 +906,7 @@ static void ov5_021D1878 (FieldSystem * param0) ov5_021F1328(param0->unk_40); { - UnkStruct_02027860 * v3 = sub_02027860(sub_0203D174(param0)); + UnkStruct_02027860 * v3 = sub_02027860(FieldSystem_SaveData(param0)); int v4 = sub_02027F80(v3); sub_0205E884(param0->playerAvatar, v4); @@ -994,7 +994,7 @@ static void ov5_021D1A70 (UnkStruct_ov5_021D1A68 * param0) static BOOL ov5_021D1A78 (FieldSystem * param0) { - UnkStruct_02027860 * v0 = sub_02027860(sub_0203D174(param0)); + UnkStruct_02027860 * v0 = sub_02027860(FieldSystem_SaveData(param0)); int v1 = sub_02027F80(v0); if (v1 == 9) { diff --git a/src/overlay005/ov5_021D1C30.c b/src/overlay005/ov5_021D1C30.c index 446517455f..f8ba123606 100644 --- a/src/overlay005/ov5_021D1C30.c +++ b/src/overlay005/ov5_021D1C30.c @@ -123,7 +123,7 @@ void ov5_021D1CAC (UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1, u16 pa ov5_021D1C30(param0); - v0 = sub_0205EB14(param1->playerAvatar); + v0 = Player_MoveState(param1->playerAvatar); v1 = sub_0205EB0C(param1->playerAvatar); v2 = Player_Dir(param1->playerAvatar); diff --git a/src/overlay005/ov5_021F8370.c b/src/overlay005/ov5_021F8370.c index 0e92fabe5b..6921d2ecea 100644 --- a/src/overlay005/ov5_021F8370.c +++ b/src/overlay005/ov5_021F8370.c @@ -66,7 +66,7 @@ void ov5_021F8370 (FieldSystem * param0) UnkStruct_02071C34 * v2; UnkStruct_ov5_021F8480 * v3; - v1 = sub_02027860(sub_0203D174(param0)); + v1 = sub_02027860(FieldSystem_SaveData(param0)); v2 = sub_02027F6C(v1, 10); v3 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021F8480)); @@ -115,7 +115,7 @@ BOOL ov5_021F83D4 (FieldSystem * param0, const int param1, const int param2, con BOOL ov5_021F8410 (FieldSystem * param0, const int param1, const int param2, const int param3) { - UnkStruct_02027860 * v0 = sub_02027860(sub_0203D174(param0)); + UnkStruct_02027860 * v0 = sub_02027860(FieldSystem_SaveData(param0)); if (sub_02027F80(v0) == 10) { int v1; diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c index 6dfb15b84e..2b40c1fe92 100644 --- a/src/overlay006/ov6_02240C9C.c +++ b/src/overlay006/ov6_02240C9C.c @@ -342,7 +342,7 @@ BOOL ov6_02240D5C (FieldSystem * param0) v13[v18].unk_06 = v12->unk_04[v18].unk_00; } - v19 = sub_02027474(sub_02027560(sub_0203D174(param0))); + v19 = sub_02027474(sub_02027560(FieldSystem_SaveData(param0))); ov6_02240C9C(v12, &v13[2].unk_00, &v13[3].unk_00); ov6_02240CC8(param0, v12, &v13[0].unk_00, &v13[1].unk_00); @@ -562,7 +562,7 @@ BOOL ov6_022411C8 (FieldSystem * param0, UnkStruct_020508D4 * param1) v12[v16].unk_06 = v11->unk_04[v16].unk_00; } - v17 = sub_02027474(sub_02027560(sub_0203D174(param0))); + v17 = sub_02027474(sub_02027560(FieldSystem_SaveData(param0))); ov6_02240C9C(v11, &v12[2].unk_00, &v12[3].unk_00); ov6_02240CC8(param0, v11, &v12[0].unk_00, &v12[1].unk_00); @@ -710,7 +710,7 @@ BOOL ov6_022413E4 (FieldSystem * param0, BattleParams ** param1) v12[v17].unk_06 = v11->unk_04[v17].unk_00; } - v18 = sub_02027474(sub_02027560(sub_0203D174(param0))); + v18 = sub_02027474(sub_02027560(FieldSystem_SaveData(param0))); ov6_02240C9C(v11, &v12[2].unk_00, &v12[3].unk_00); ov6_02240CC8(param0, v11, &v12[0].unk_00, &v12[1].unk_00); @@ -769,7 +769,7 @@ static BOOL ov6_02241674 (FieldSystem * param0, Pokemon * param1, BattleParams * if (param6->unk_04 == 1) { TrainerInfo * v3; - v3 = SaveData_GetTrainerInfo(sub_0203D174(param0)); + v3 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0)); v0 = ov6_02241F2C(v1, v2, 1, param6->unk_08, TrainerInfo_ID(v3), param5, param1, param2); } else { v0 = ov6_02241F7C(param0, param1, param5, param4, 1, param2, v1, v2); diff --git a/src/overlay006/ov6_02242984.c b/src/overlay006/ov6_02242984.c index 0934e26010..f0323b0b02 100644 --- a/src/overlay006/ov6_02242984.c +++ b/src/overlay006/ov6_02242984.c @@ -45,7 +45,7 @@ int ov6_02242984 (FieldSystem * param0) v2[v0] = v3->unk_04[v0].unk_04; } - v1 = sub_02027474(sub_02027560(sub_0203D174(param0))); + v1 = sub_02027474(sub_02027560(FieldSystem_SaveData(param0))); ov6_02242F74(sub_0202D814(sub_0202D834(param0->unk_0C), 1), v1, param0->unk_1C->unk_00, &v2[6], &v2[7]); ov6_02240C9C(v3, &v2[2], &v2[3]); diff --git a/src/overlay006/ov6_02242AF0.c b/src/overlay006/ov6_02242AF0.c index 5140e7eb6b..986dc8e21b 100644 --- a/src/overlay006/ov6_02242AF0.c +++ b/src/overlay006/ov6_02242AF0.c @@ -87,7 +87,7 @@ void ov6_02242AF0 (FieldSystem * param0) UnkStruct_ov6_02242AF0 * v1; VecFx32 v2; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); v1 = (UnkStruct_ov6_02242AF0 *)sub_02027F6C(v0, 6); v2.x = ((FX32_ONE * 16) * (32 * 2 + 2)); @@ -114,7 +114,7 @@ void ov6_02242B58 (FieldSystem * param0, const u16 param1, const u16 param2) UnkStruct_ov6_02242AF0 * v1; UnkStruct_ov6_02242B58 * v2; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); v1 = (UnkStruct_ov6_02242AF0 *)sub_02027F6C(v0, 6); v2 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov6_02242B58)); @@ -183,7 +183,7 @@ u32 ov6_02242C3C (FieldSystem * param0, const u16 param1) UnkStruct_02027860 * v0; UnkStruct_ov6_02242AF0 * v1; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); v1 = (UnkStruct_ov6_02242AF0 *)sub_02027F6C(v0, 6); if (v1->unk_00 == param1) { diff --git a/src/overlay006/ov6_02247A0C.c b/src/overlay006/ov6_02247A0C.c index 4a5095faa2..1386bd566c 100644 --- a/src/overlay006/ov6_02247A0C.c +++ b/src/overlay006/ov6_02247A0C.c @@ -138,7 +138,7 @@ void * ov6_02247A90 (void * param0) SaveData * v8; v1 = sub_0203D170(param0); - v8 = sub_0203D174(param0); + v8 = FieldSystem_SaveData(param0); v0 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov6_02247A90)); MI_CpuClear8(v0, sizeof(UnkStruct_ov6_02247A90)); diff --git a/src/overlay007/ov7_02249960.c b/src/overlay007/ov7_02249960.c index c800cf399c..c59054688e 100644 --- a/src/overlay007/ov7_02249960.c +++ b/src/overlay007/ov7_02249960.c @@ -198,7 +198,7 @@ static void ov7_02249AB4 (FieldSystem * param0) Unk_ov7_0224F5A0->unk_68 = param0; Unk_ov7_0224F5A0->unk_97 = 0; Unk_ov7_0224F5A0->unk_74 = MessageLoader_Init(1, 26, 353, 4); - Unk_ov7_0224F5A0->unk_78 = SaveData_GetTrainerInfo(sub_0203D174(Unk_ov7_0224F5A0->unk_68)); + Unk_ov7_0224F5A0->unk_78 = SaveData_GetTrainerInfo(FieldSystem_SaveData(Unk_ov7_0224F5A0->unk_68)); Unk_ov7_0224F5A0->unk_7C = TrainerInfo_New(4); sub_0201A7A0(&Unk_ov7_0224F5A0->unk_20); diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c index 794b5e8f9e..dc50881d5b 100644 --- a/src/overlay008/ov8_02249960.c +++ b/src/overlay008/ov8_02249960.c @@ -363,7 +363,7 @@ void ov8_0224997C (FieldSystem * param0) UnkStruct_02027860 * v7; UnkStruct_02071B10 * v8; - v7 = sub_02027860(sub_0203D174(param0)); + v7 = sub_02027860(FieldSystem_SaveData(param0)); v8 = (UnkStruct_02071B10 *)sub_02027F6C(v7, 1); v6 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov8_0224997C)); @@ -617,7 +617,7 @@ void ov8_02249DBC (FieldSystem * param0) UnkStruct_02027860 * v7; UnkStruct_02071B10 * v8; - v7 = sub_02027860(sub_0203D174(param0)); + v7 = sub_02027860(FieldSystem_SaveData(param0)); v8 = (UnkStruct_02071B10 *)sub_02027F6C(v7, 1); { @@ -765,7 +765,7 @@ void ov8_02249FB8 (FieldSystem * param0) UnkStruct_02027860 * v2; UnkStruct_ov8_02249FB8 * v3; - v2 = sub_02027860(sub_0203D174(param0)); + v2 = sub_02027860(FieldSystem_SaveData(param0)); v3 = (UnkStruct_ov8_02249FB8 *)sub_02027F6C(v2, 2); sub_0205EAEC(param0->playerAvatar, &v1); @@ -1255,7 +1255,7 @@ static void ov8_0224A254 (UnkStruct_ov8_0224A1E4 * param0, const u8 param1) UnkStruct_02027860 * v3; UnkStruct_02071B30 * v4; - v3 = sub_02027860(sub_0203D174(param0->unk_00)); + v3 = sub_02027860(FieldSystem_SaveData(param0->unk_00)); v4 = (UnkStruct_02071B30 *)sub_02027F6C(v3, 3); v2 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov8_0224997C)); @@ -1591,7 +1591,7 @@ void ov8_0224A8C8 (FieldSystem * param0) UnkStruct_02027860 * v1; UnkStruct_02071B30 * v2; - v1 = sub_02027860(sub_0203D174(param0)); + v1 = sub_02027860(FieldSystem_SaveData(param0)); v2 = (UnkStruct_02071B30 *)sub_02027F6C(v1, 3); param0->unk_04->unk_24 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov8_0224A1E4)); @@ -1674,7 +1674,7 @@ BOOL ov8_0224AAA8 (FieldSystem * param0) int v2; UnkStruct_02027860 * v3; - v3 = sub_02027860(sub_0203D174(param0)); + v3 = sub_02027860(FieldSystem_SaveData(param0)); v2 = sub_02027F80(v3); if (v2 != 3) { @@ -2100,7 +2100,7 @@ void ov8_0224ABD4 (FieldSystem * param0) UnkStruct_02027860 * v1; UnkStruct_02071B6C * v2; - v1 = sub_02027860(sub_0203D174(param0)); + v1 = sub_02027860(FieldSystem_SaveData(param0)); v2 = (UnkStruct_02071B6C *)sub_02027F6C(v1, 5); param0->unk_04->unk_24 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov8_0224ABD4)); @@ -2189,7 +2189,7 @@ void ov8_0224AD34 (FieldSystem * param0, const u8 param1) UnkStruct_02027860 * v2; UnkStruct_02071B6C * v3; - v2 = sub_02027860(sub_0203D174(param0)); + v2 = sub_02027860(FieldSystem_SaveData(param0)); v3 = (UnkStruct_02071B6C *)sub_02027F6C(v2, 5); v1 = (UnkStruct_ov8_0224ABD4 *)param0->unk_04->unk_24; v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov8_0224997C)); @@ -2527,7 +2527,7 @@ void ov8_0224B020 (FieldSystem * param0) UnkStruct_02071BD0 * v1; UnkStruct_ov8_0224AF00 * v2; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); v1 = sub_02027F6C(v0, 8); v2 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov8_0224AF00)); @@ -2590,7 +2590,7 @@ BOOL ov8_0224B110 (FieldSystem * param0, const int param1, const int param2, con UnkStruct_02027860 * v4; UnkStruct_02071BD0 * v5; - v4 = sub_02027860(sub_0203D174(param0)); + v4 = sub_02027860(FieldSystem_SaveData(param0)); v5 = sub_02027F6C(v4, 8); v1 = v5->unk_00; v0 = 0; @@ -2974,7 +2974,7 @@ BOOL ov8_0224B67C (FieldSystem * param0, Window * param1, MessageLoader * param2 UnkStruct_02027860 * v0; UnkStruct_02071BD0 * v1; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); v1 = sub_02027F6C(v0, 8); if (v1->unk_00 >= 4) { @@ -3013,7 +3013,7 @@ BOOL ov8_0224B714 (FieldSystem * param0, int param1, int param2, int param3) UnkStruct_02071BD0 * v1; const UnkStruct_ov8_0224C7F0 * v2; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); v1 = sub_02027F6C(v0, 8); v2 = &Unk_ov8_0224C7F0[v1->unk_00]; @@ -3102,7 +3102,7 @@ void ov8_0224B764 (FieldSystem * param0) UnkStruct_02071BF8 * v1; UnkStruct_ov8_0224B8D0 * v2; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); v1 = sub_02027F6C(v0, 4); v2 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov8_0224B8D0)); @@ -3650,7 +3650,7 @@ BOOL ov8_0224BF4C (FieldSystem * param0) { UnkStruct_02027860 * v0; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); if (sub_02027F80(v0) != 4) { return 0; @@ -3881,7 +3881,7 @@ void ov8_0224C198 (FieldSystem * param0) UnkStruct_02071C18 * v1; UnkStruct_ov8_0224C444 * v2; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); v1 = sub_02027F6C(v0, 2); v2 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov8_0224C444)); @@ -4080,7 +4080,7 @@ BOOL ov8_0224C51C (FieldSystem * param0) LocalMapObject * v7; LocalMapObject * v8; - v4 = sub_02027860(sub_0203D174(param0)); + v4 = sub_02027860(FieldSystem_SaveData(param0)); if (sub_02027F80(v4) != 2) { return 0; @@ -4115,7 +4115,7 @@ BOOL ov8_0224C5DC (FieldSystem * param0, void * param1) { UnkStruct_02027860 * v0; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); if (sub_02027F80(v0) != 2) { return 0; @@ -4145,7 +4145,7 @@ BOOL ov8_0224C62C (FieldSystem * param0, int param1, int param2, int * param3) { UnkStruct_02027860 * v0; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); if (sub_02027F80(v0) != 2) { return 0; diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c index 2e5eb32247..6a1fa194a9 100644 --- a/src/overlay009/ov9_02249960.c +++ b/src/overlay009/ov9_02249960.c @@ -1182,7 +1182,7 @@ void ov9_02249960 (FieldSystem * param0) UnkStruct_02071C5C * v1; UnkStruct_ov9_02249B04 * v2; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); v1 = sub_02027F6C(v0, 9); v2 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov9_02249B04)); @@ -1614,7 +1614,7 @@ void ov9_02249FD0 (FieldSystem * param0) GF_ASSERT(param0 != NULL); - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); v1 = sub_02027F6C(v0, 9); v1->unk_04 = 0; @@ -2055,7 +2055,7 @@ BOOL ov9_0224A59C (FieldSystem * param0, int param1) { UnkStruct_02027860 * v0; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); if (sub_02027F80(v0) == 9) { int v1, v2, v3, v4; @@ -2139,7 +2139,7 @@ BOOL ov9_0224A71C (FieldSystem * param0) { UnkStruct_02027860 * v0; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); if (sub_02027F80(v0) != 9) { return 0; @@ -9509,7 +9509,7 @@ BOOL ov9_02250F74 (FieldSystem * param0) { UnkStruct_02027860 * v0; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); if (sub_02027F80(v0) != 9) { return 0; @@ -9577,7 +9577,7 @@ BOOL ov9_02251044 (FieldSystem * param0, int param1, int param2, int param3, u32 { UnkStruct_02027860 * v0; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); if (sub_02027F80(v0) != 9) { GF_ASSERT(0); diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c index f6fa08133e..4bc1d3986d 100644 --- a/src/overlay023/ov23_0223E140.c +++ b/src/overlay023/ov23_0223E140.c @@ -621,7 +621,7 @@ static void ov23_0223E140 (void) void ov23_0223E1E4 (void * param0, FieldSystem * param1) { int v0, v1; - UnkStruct_020298B0 * v2; + UndergroundData * v2; if (Unk_ov23_02257740) { return; @@ -770,7 +770,7 @@ static void ov23_0223E434 (MATHRandContext16 * param0, int param1) u16 v4, v5, v6; u16 v7, v8, v9; UnkStruct_ov23_0223E6F8 * v10; - UnkStruct_020298B0 * v11 = sub_020298B0(Unk_ov23_02257740->unk_00->unk_0C); + UndergroundData * v11 = sub_020298B0(Unk_ov23_02257740->unk_00->unk_0C); v6 = (sub_02039E10(Unk_ov23_02257740->unk_00->unk_2C) - 2) * 32; v9 = (sub_02039E20(Unk_ov23_02257740->unk_00->unk_2C) - 2) * 32; @@ -831,7 +831,7 @@ void ov23_0223E650 (int param0, int param1, MATHRandContext16 * param2) int v0, v1, v2, v3; u16 v4, v5; UnkStruct_ov23_0223E6F8 * v6; - UnkStruct_020298B0 * v7 = sub_020298B0(Unk_ov23_02257740->unk_00->unk_0C); + UndergroundData * v7 = sub_020298B0(Unk_ov23_02257740->unk_00->unk_0C); v3 = 0; @@ -904,7 +904,7 @@ static UnkStruct_ov23_0223E6F8 * ov23_0223E740 (int param0, int param1) static void ov23_0223E834 (void) { - UnkStruct_020298B0 * v0 = sub_020298B0(Unk_ov23_02257740->unk_00->unk_0C); + UndergroundData * v0 = sub_020298B0(Unk_ov23_02257740->unk_00->unk_0C); int v1; int v2, v3; UnkStruct_ov23_0223E6F8 * v4; @@ -1061,7 +1061,7 @@ static void ov23_0223EA38 (SysTask * param0, void * param1) void ov23_0223EAF8 (int param0, int param1, void * param2, void * param3) { - UnkStruct_020298B0 * v0 = sub_020298B0(Unk_ov23_02257740->unk_00->unk_0C); + UndergroundData * v0 = sub_020298B0(Unk_ov23_02257740->unk_00->unk_0C); UnkStruct_ov23_0223E6F8 * v1 = Unk_ov23_02257740->unk_84C[param0]; u8 v2 = param0; u8 * v3 = param2; @@ -1486,7 +1486,7 @@ static void ov23_0223F118 (SysTask * param0, void * param1) v0->unk_08++; if (v0->unk_08 > 80) { - UnkStruct_020298B0 * v2 = sub_020298B0(sub_0203D174(Unk_ov23_02257740->unk_00)); + UndergroundData * v2 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257740->unk_00)); ov23_02254044(ov23_0224219C()); @@ -1789,8 +1789,8 @@ static BOOL ov23_0223F838 (int param0, int param1, int param2) static int ov23_0223F970 (UnkStruct_ov23_02256EB0 * param0) { - SaveData * v0 = sub_0203D174(Unk_ov23_02257740->unk_00); - UnkStruct_020298B0 * v1 = sub_020298B0(v0); + SaveData * v0 = FieldSystem_SaveData(Unk_ov23_02257740->unk_00); + UndergroundData * v1 = sub_020298B0(v0); BOOL v2 = TrainerInfo_ID(SaveData_GetTrainerInfo(v0)) % 2; BOOL v3 = sub_02027474(sub_02027560(v0)); int v4 = 0; @@ -1862,7 +1862,7 @@ static int ov23_0223FA20 (void) static void ov23_0223FA3C (BGL * param0, int param1, UnkStruct_ov23_0223EE80 * param2) { - UnkStruct_020298B0 * v0 = sub_020298B0(sub_0203D174(Unk_ov23_02257740->unk_00)); + UndergroundData * v0 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257740->unk_00)); int v1, v2, v3 = ov23_0223F9C8(); int v4, v5, v6, v7, v8 = 0, v9, v10; int v11 = ov23_0223FA20(); @@ -2509,8 +2509,8 @@ static int ov23_0224080C (int param0) static void ov23_022408A0 (int param0, int param1) { int v0 = param0; - UnkStruct_0202855C * v1 = sub_020298A0(sub_0203D174(Unk_ov23_02257740->unk_00)); - UnkStruct_020298B0 * v2 = sub_020298B0(sub_0203D174(Unk_ov23_02257740->unk_00)); + SecretBaseRecord * v1 = SaveData_SecretBaseRecord(FieldSystem_SaveData(Unk_ov23_02257740->unk_00)); + UndergroundData * v2 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257740->unk_00)); if (ov23_02241CF4(v0)) { ov23_0224F6E0(v0, param1); @@ -2522,7 +2522,7 @@ static void ov23_022408A0 (int param0, int param1) static BOOL ov23_022408EC (int param0) { - UnkStruct_020298B0 * v0 = sub_020298B0(sub_0203D174(Unk_ov23_02257740->unk_00)); + UndergroundData * v0 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257740->unk_00)); if (ov23_02241CF4(param0)) { if (40 == sub_02028C3C(v0)) { @@ -2602,8 +2602,8 @@ static BOOL ov23_022409F0 (UnkStruct_ov23_0223EE80 * param0) static BOOL ov23_02240A90 (UnkStruct_ov23_0223EE80 * param0) { int v0, v1, v2; - UnkStruct_0202855C * v3 = sub_020298A0((Unk_ov23_02257740->unk_00->unk_0C)); - UnkStruct_020298B0 * v4 = sub_020298B0((Unk_ov23_02257740->unk_00->unk_0C)); + SecretBaseRecord * v3 = SaveData_SecretBaseRecord((Unk_ov23_02257740->unk_00->unk_0C)); + UndergroundData * v4 = sub_020298B0((Unk_ov23_02257740->unk_00->unk_0C)); for (v0 = 0; v0 < param0->unk_0C; v0++) { if (Unk_ov23_02257740->unk_874[v0].unk_08 == 1) { @@ -2695,7 +2695,7 @@ static BOOL ov23_02240CFC (UnkStruct_ov23_0223EE80 * param0) { u8 v0[2]; int v1; - UnkStruct_020298B0 * v2 = sub_020298B0(sub_0203D174(Unk_ov23_02257740->unk_00)); + UndergroundData * v2 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257740->unk_00)); if (Unk_ov23_02257740->unk_A29 == 1) { Unk_ov23_02257740->unk_A29 = 0; diff --git a/src/overlay023/ov23_022416A8.c b/src/overlay023/ov23_022416A8.c index d2618a69c4..c117f39673 100644 --- a/src/overlay023/ov23_022416A8.c +++ b/src/overlay023/ov23_022416A8.c @@ -86,7 +86,7 @@ static void ov23_022416B0 (int param0) void ov23_022416E0 (void * param0, FieldSystem * param1) { int v0; - UnkStruct_020298B0 * v1; + UndergroundData * v1; if (Unk_ov23_02257744) { return; @@ -96,7 +96,7 @@ void ov23_022416E0 (void * param0, FieldSystem * param1) MI_CpuFill8(Unk_ov23_02257744, 0, sizeof(UnkStruct_ov23_02257744)); Unk_ov23_02257744->unk_464 = param1; - v1 = sub_020298B0(sub_0203D174(param1)); + v1 = sub_020298B0(FieldSystem_SaveData(param1)); for (v0 = 0; v0 < 100; v0++) { Unk_ov23_02257744->unk_00[v0].unk_06 = sub_020290DC(v1, v0); @@ -113,7 +113,7 @@ void ov23_022416E0 (void * param0, FieldSystem * param1) static void ov23_02241778 (void) { - UnkStruct_020298B0 * v0 = sub_020298B0(sub_0203D174(Unk_ov23_02257744->unk_464)); + UndergroundData * v0 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257744->unk_464)); int v1; for (v1 = 0; v1 < 100; v1++) { @@ -526,7 +526,7 @@ BOOL ov23_02241D58 (Strbuf *param0) int ov23_02241DF8 (MATHRandContext16 * param0) { - UnkStruct_020298B0 * v0 = sub_020298B0(sub_0203D174(Unk_ov23_02257744->unk_464)); + UndergroundData * v0 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257744->unk_464)); int v1, v2, v3; for (v3 = 0; v3 < 100; v3++) { diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c index 4657c56920..16b241fd3f 100644 --- a/src/overlay023/ov23_02241F74.c +++ b/src/overlay023/ov23_02241F74.c @@ -577,7 +577,7 @@ void ov23_02242830 (u8 param0) u8 v0 = param0; UnkStruct_ov23_02242830 v1; int v2, v3; - UnkStruct_020298B0 * v4 = sub_020298B0(Unk_ov23_02257748->unk_0C->unk_0C); + UndergroundData * v4 = sub_020298B0(Unk_ov23_02257748->unk_0C->unk_0C); if ((Unk_ov23_02257748->unk_146 != 0) && (Unk_ov23_02257748->unk_134 != 0)) { return; @@ -795,8 +795,8 @@ void ov23_02242BC0 (FieldSystem * param0) ov23_0223E1E4(v0, param0); v0 = Heap_AllocFromHeap(15, ov23_02253608()); - ov23_02253598(v0, sub_020298A0(sub_0203D174(param0)), sub_0203D174(param0)); - ov23_0224F588(sub_020298B0(sub_0203D174(param0))); + ov23_02253598(v0, SaveData_SecretBaseRecord(FieldSystem_SaveData(param0)), FieldSystem_SaveData(param0)); + ov23_0224F588(sub_020298B0(FieldSystem_SaveData(param0))); } } diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c index ebe4f91e88..54d32a85c0 100644 --- a/src/overlay023/ov23_0224340C.c +++ b/src/overlay023/ov23_0224340C.c @@ -624,7 +624,7 @@ static const UnkFuncPtr_ov23_022564CC Unk_ov23_022565E4[] = { static void ov23_0224340C (void) { int v0; - UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(Unk_ov23_02257764->unk_40)); + UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257764->unk_40)); for (v0 = 0; v0 < 16; v0++) { Unk_ov23_02257764->unk_308[v0].unk_04 = sub_02029030(v1, v0); @@ -643,7 +643,7 @@ static void ov23_0224340C (void) void ov23_022434BC (void * param0, FieldSystem * param1) { int v0; - UnkStruct_020298B0 * v1; + UndergroundData * v1; if (Unk_ov23_02257764) { return; @@ -653,7 +653,7 @@ void ov23_022434BC (void * param0, FieldSystem * param1) MI_CpuFill8(Unk_ov23_02257764, 0, sizeof(UnkStruct_ov23_02257764)); Unk_ov23_02257764->unk_40 = param1; - v1 = sub_020298B0(sub_0203D174(param1)); + v1 = sub_020298B0(FieldSystem_SaveData(param1)); Unk_ov23_02257764->unk_2F0 = NULL; @@ -740,7 +740,7 @@ void ov23_022435DC (void) void ov23_02243670 (FieldSystem * param0) { int v0; - UnkStruct_020298B0 * v1; + UndergroundData * v1; for (v0 = 0; v0 < 16; v0++) { if (Unk_ov23_02257764->unk_368[v0]) { @@ -1103,7 +1103,7 @@ int ov23_02243C3C (int param0, int param1, MATHRandContext16 * param2, int param int v2, v3; UnkStruct_ov23_02243DA8 * v4; UnkStruct_ov23_02243DA8 * v5; - UnkStruct_020298B0 * v6 = sub_020298B0(Unk_ov23_02257764->unk_40->unk_0C); + UndergroundData * v6 = sub_020298B0(Unk_ov23_02257764->unk_40->unk_0C); if (param3 >= (16 * 4)) { return 0; @@ -1136,7 +1136,7 @@ int ov23_02243C3C (int param0, int param1, MATHRandContext16 * param2, int param void ov23_02243CE8 (void) { int v0; - UnkStruct_020298B0 * v1 = sub_020298B0(Unk_ov23_02257764->unk_40->unk_0C); + UndergroundData * v1 = sub_020298B0(Unk_ov23_02257764->unk_40->unk_0C); for (v0 = 0; v0 < (16 * 4); v0++) { int v2 = sub_02028F40(v1, v0); @@ -1158,7 +1158,7 @@ void ov23_02243CE8 (void) static void ov23_02243D50 (void) { - UnkStruct_020298B0 * v0 = sub_020298B0(sub_0203D174(Unk_ov23_02257764->unk_40)); + UndergroundData * v0 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257764->unk_40)); int v1; for (v1 = 0; v1 < 16; v1++) { @@ -1332,7 +1332,7 @@ BOOL ov23_02244080 (int param0, UnkStruct_ov23_0224271C * param1, u8 param2) u8 v2 = param0; UnkStruct_ov23_02243DA8 * v3; UnkStruct_ov23_02244140 v4; - UnkStruct_020298B0 * v5 = sub_020298B0(sub_0203D174(Unk_ov23_02257764->unk_40)); + UndergroundData * v5 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257764->unk_40)); v0 = CommPlayer_AddXServer(param0); v1 = sub_02058F18(param0); @@ -1473,7 +1473,7 @@ static BOOL ov23_022442F0 (int param0) { UnkStruct_ov23_02244140 v0; UnkStruct_ov23_02243DA8 * v1; - UnkStruct_020298B0 * v2 = sub_020298B0(Unk_ov23_02257764->unk_40->unk_0C); + UndergroundData * v2 = sub_020298B0(Unk_ov23_02257764->unk_40->unk_0C); if (ov23_0224162C(param0)) { return 0; @@ -1550,13 +1550,13 @@ BOOL ov23_02244470 (int param0) void ov23_0224448C (int param0, int param1, void * param2, void * param3) { UnkStruct_ov23_02244140 * v0 = (UnkStruct_ov23_02244140 *)param2; - UnkStruct_0202855C * v1; + SecretBaseRecord * v1; if (!Unk_ov23_02257764) { return; } - v1 = sub_020298A0(sub_0203D174(Unk_ov23_02257764->unk_40)); + v1 = SaveData_SecretBaseRecord(FieldSystem_SaveData(Unk_ov23_02257764->unk_40)); Sound_PlayEffect(1570); MI_CpuCopy8(v0, &Unk_ov23_02257764->unk_B28[v0->unk_07_0], sizeof(UnkStruct_ov23_02244140)); @@ -2554,7 +2554,7 @@ void ov23_02245560 (int param0, int param1) void ov23_022455B4 (int param0, int param1, void * param2, void * param3) { UnkStruct_ov23_02245560 * v0 = param2; - UnkStruct_0202855C * v1 = sub_020298A0(sub_0203D174(Unk_ov23_02257764->unk_40)); + SecretBaseRecord * v1 = SaveData_SecretBaseRecord(FieldSystem_SaveData(Unk_ov23_02257764->unk_40)); ov23_0224B024(v0->unk_01); diff --git a/src/overlay023/ov23_02248C08.c b/src/overlay023/ov23_02248C08.c index d8d1463591..f850097382 100644 --- a/src/overlay023/ov23_02248C08.c +++ b/src/overlay023/ov23_02248C08.c @@ -21,7 +21,7 @@ #include "unk_0202854C.h" #include "overlay023/ov23_02248C08.h" -UnkStruct_ov23_02248D20 * ov23_02248C08 (UnkStruct_ov84_02240FA8 * param0, u16 param1, u16 param2, u8 param3, UnkFuncPtr_ov23_02248D20 param4, UnkStruct_020298B0 * param5, BOOL param6) +UnkStruct_ov23_02248D20 * ov23_02248C08 (UnkStruct_ov84_02240FA8 * param0, u16 param1, u16 param2, u8 param3, UnkFuncPtr_ov23_02248D20 param4, UndergroundData * param5, BOOL param6) { UnkStruct_ov23_02248D20 * v0 = (UnkStruct_ov23_02248D20 *)Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov23_02248D20)); diff --git a/src/overlay023/ov23_022499E4.c b/src/overlay023/ov23_022499E4.c index 20b367219d..78b71713db 100644 --- a/src/overlay023/ov23_022499E4.c +++ b/src/overlay023/ov23_022499E4.c @@ -72,7 +72,7 @@ void ov23_022499E8 (FieldSystem * param0) return; } - sub_02036794(sub_0203D174(param0)); + sub_02036794(FieldSystem_SaveData(param0)); FieldCommMan_Init(param0); v0 = FieldCommMan_Get(); diff --git a/src/overlay023/ov23_0224A1D0.c b/src/overlay023/ov23_0224A1D0.c index 1f3073ba6c..87d7b1ce19 100644 --- a/src/overlay023/ov23_0224A1D0.c +++ b/src/overlay023/ov23_0224A1D0.c @@ -94,7 +94,7 @@ static void ov23_0224A204 (int param0) } v1->unk_27C[0] = v1->unk_290[param0]; - sub_02028830(sub_020298B0(sub_0203D174(v1->fieldSys)), v1->unk_290[param0]); + sub_02028830(sub_020298B0(FieldSystem_SaveData(v1->fieldSys)), v1->unk_290[param0]); v1->unk_290[param0] = NULL; v1->unk_14A[param0].unk_20 = 0xff; @@ -228,7 +228,7 @@ void ov23_0224A410 (int param0, int param1, void * param2, void * param3) v0->unk_58.unk_00_9 = 0; if (v0->unk_5A[v1->unk_02] == 0) { - sub_020294F4(sub_020298A0(sub_0203D174(v0->fieldSys)), v1->unk_02); + sub_020294F4(SaveData_SecretBaseRecord(FieldSystem_SaveData(v0->fieldSys)), v1->unk_02); sub_0206B364(v2, sub_0206B354(v2) + 1); sub_0206B384(v2, sub_0206B374(v2) + 1); @@ -366,7 +366,7 @@ BOOL ov23_0224A6B8 (int param0) return 1; } -static void ov23_0224A6E4 (UnkStruct_ov23_0224A570 * param0, BOOL param1, UnkStruct_0202855C * param2) +static void ov23_0224A6E4 (UnkStruct_ov23_0224A570 * param0, BOOL param1, SecretBaseRecord * param2) { CommPlayer * v0 = CommPlayerData_Get(); @@ -396,7 +396,7 @@ void ov23_0224A77C (int param0, int param1, void * param2, void * param3) UnkStruct_ov23_0224A570 * v1 = param2; BOOL v2; int v3 = 0; - UnkStruct_0202855C * v4 = sub_020298A0(sub_0203D174(v0->fieldSys)); + SecretBaseRecord * v4 = SaveData_SecretBaseRecord(FieldSystem_SaveData(v0->fieldSys)); switch (v1->unk_00) { case 0: @@ -470,7 +470,7 @@ void ov23_0224A77C (int param0, int param1, void * param2, void * param3) ov23_0224B040(v1->unk_01); if (v1->unk_01 == CommSys_CurNetId()) { - UnkStruct_0202855C * v5 = sub_020298A0(sub_0203D174(v0->fieldSys)); + SecretBaseRecord * v5 = SaveData_SecretBaseRecord(FieldSystem_SaveData(v0->fieldSys)); u8 v6 = sub_0202958C(v5); sub_020295C0(v5); @@ -806,7 +806,7 @@ BOOL ov23_0224AEC4 (int param0, int param1) TrainerInfo_Copy(v1, (TrainerInfo *)&v0->unk_14A[param0].unk_00); if (param1 == CommSys_CurNetId()) { - UnkStruct_0202855C * v2 = sub_020298A0(v0->fieldSys->unk_0C); + SecretBaseRecord * v2 = SaveData_SecretBaseRecord(v0->fieldSys->unk_0C); sub_020297B4(v2); } diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c index 8b8102fe4f..60b42ff284 100644 --- a/src/overlay023/ov23_0224B05C.c +++ b/src/overlay023/ov23_0224B05C.c @@ -379,9 +379,9 @@ void ov23_0224B144 (void * param0, FieldSystem * param1) void ov23_0224B2C8 (FieldSystem * param0) { UnkStruct_02029894 * v0; - UnkStruct_0202855C * v1; + SecretBaseRecord * v1; - v0 = sub_02029894(sub_0203D174(param0)); + v0 = sub_02029894(FieldSystem_SaveData(param0)); v1 = sub_020298AC(v0); sub_020294D4(v1, sub_0202D034(sub_0202CD88(param0->unk_0C))); @@ -1988,7 +1988,7 @@ static void ov23_0224CEC8 (void) void ov23_0224CF18 (int param0, int param1, void * param2, void * param3) { UnkStruct_ov23_0224CF18 * v0 = param2; - UnkStruct_0202855C * v1 = sub_020298A0(sub_0203D174(Unk_ov23_022577AC->unk_00)); + SecretBaseRecord * v1 = SaveData_SecretBaseRecord(FieldSystem_SaveData(Unk_ov23_022577AC->unk_00)); if (v0->unk_00 != CommSys_CurNetId()) { return; @@ -2158,8 +2158,8 @@ BOOL ov23_0224D1A0 (int param0, int param1) static void ov23_0224D238 (void) { - UnkStruct_02029894 * v0 = sub_02029894(sub_0203D174(Unk_ov23_022577AC->unk_00)); - UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(Unk_ov23_022577AC->unk_00)); + UnkStruct_02029894 * v0 = sub_02029894(FieldSystem_SaveData(Unk_ov23_022577AC->unk_00)); + UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_022577AC->unk_00)); int v2 = CommPlayer_AddXServer(0); int v3 = sub_02058F18(0); int v4 = CommPlayer_DirServer(0); @@ -2308,7 +2308,7 @@ void ov23_0224D4CC (int param0, int param1, void * param2, void * param3) { u8 * v0 = param2; UnkStruct_02029894 * v1 = (UnkStruct_02029894 *)Unk_ov23_022577AC->unk_A00->unk_02; - UnkStruct_0202855C * v2 = sub_020298AC(v1); + SecretBaseRecord * v2 = sub_020298AC(v1); if (v0[0] == CommSys_CurNetId()) { ov23_02253A00(v2, v0[1]); diff --git a/src/overlay023/ov23_0224DC40.c b/src/overlay023/ov23_0224DC40.c index ec65761ff3..1ab435b181 100644 --- a/src/overlay023/ov23_0224DC40.c +++ b/src/overlay023/ov23_0224DC40.c @@ -468,7 +468,7 @@ static void ov23_0224E124 (UnkStruct_ov23_0224E280 * param0) ov23_022540F4(ov23_0224219C(), param0->unk_28.unk_02); ov23_02253F40(ov23_0224219C(), 14, 0, NULL); - sub_0202952C(sub_020298A0(sub_0203D174(param0->unk_08))); + sub_0202952C(SaveData_SecretBaseRecord(FieldSystem_SaveData(param0->unk_08))); ov23_0224F634(param0->unk_28.unk_02); Sound_PlayEffect(1507); } @@ -911,7 +911,7 @@ static void ov23_0224E93C (SysTask * param0, UnkStruct_ov23_022577B0 * param1) if (v0 == 0) { if (ov23_0224F744(param1->unk_24.unk_02)) { - sub_0202977C(sub_020298A0(sub_0203D174(param1->unk_04))); + sub_0202977C(SaveData_SecretBaseRecord(FieldSystem_SaveData(param1->unk_04))); Sound_PlayEffect(1507); ov23_0224DC40(param1, 22); diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c index 070d4421c1..36827c982d 100644 --- a/src/overlay023/ov23_0224F294.c +++ b/src/overlay023/ov23_0224F294.c @@ -70,7 +70,7 @@ typedef void (* UnkFuncPtr_ov23_0224FA58)(UnkStruct_ov23_02250CD4 *); typedef struct { - UnkStruct_020298B0 * unk_00; + UndergroundData * unk_00; u8 unk_04; u8 unk_05; } UnkStruct_ov23_022577B8; @@ -285,7 +285,7 @@ static void ov23_0224F560 (GraphicElementData * param0) } } -void ov23_0224F588 (UnkStruct_020298B0 * param0) +void ov23_0224F588 (UndergroundData * param0) { Unk_ov23_022577B8 = Heap_AllocFromHeap(15, sizeof(UnkStruct_ov23_022577B8)); MI_CpuClear8(Unk_ov23_022577B8, sizeof(UnkStruct_ov23_022577B8)); @@ -302,7 +302,7 @@ void ov23_0224F5B8 (void) static int ov23_0224F5C8 (void * param0) { UnkStruct_ov23_02250CD4 * v0 = param0; - UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(v0->unk_0C)); + UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->unk_0C)); return sub_02028E28(v1); } @@ -310,7 +310,7 @@ static int ov23_0224F5C8 (void * param0) static int ov23_0224F5DC (void * param0) { UnkStruct_ov23_02250CD4 * v0 = param0; - UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(v0->unk_0C)); + UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->unk_0C)); return sub_020289A0(v1); } @@ -318,7 +318,7 @@ static int ov23_0224F5DC (void * param0) int ov23_0224F5F0 (int param0, void * param1) { UnkStruct_ov23_02250CD4 * v0 = param1; - UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(v0->unk_0C)); + UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->unk_0C)); return sub_020289B8(v1, param0); } @@ -326,7 +326,7 @@ int ov23_0224F5F0 (int param0, void * param1) static int ov23_0224F608 (void * param0) { UnkStruct_ov23_02250CD4 * v0 = param0; - UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(v0->unk_0C)); + UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->unk_0C)); return sub_02028B70(v1); } @@ -334,7 +334,7 @@ static int ov23_0224F608 (void * param0) int ov23_0224F61C (int param0, void * param1) { UnkStruct_ov23_02250CD4 * v0 = param1; - UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(v0->unk_0C)); + UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->unk_0C)); return sub_02028B88(v1, param0); } @@ -348,7 +348,7 @@ void ov23_0224F634 (int param0) static int ov23_0224F658 (void * param0) { UnkStruct_ov23_02250CD4 * v0 = param0; - UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(v0->unk_0C)); + UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->unk_0C)); return sub_02028C3C(v1); } @@ -356,7 +356,7 @@ static int ov23_0224F658 (void * param0) int ov23_0224F66C (int param0, void * param1) { UnkStruct_ov23_02250CD4 * v0 = param1; - UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(v0->unk_0C)); + UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->unk_0C)); return sub_02028E44(v1, param0); } @@ -364,7 +364,7 @@ int ov23_0224F66C (int param0, void * param1) int ov23_0224F684 (int param0, void * param1) { UnkStruct_ov23_02250CD4 * v0 = param1; - UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(v0->unk_0C)); + UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->unk_0C)); return sub_02028C54(v1, param0); } @@ -372,7 +372,7 @@ int ov23_0224F684 (int param0, void * param1) int ov23_0224F69C (int param0, void * param1) { UnkStruct_ov23_02250CD4 * v0 = param1; - UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(v0->unk_0C)); + UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->unk_0C)); return sub_02028C60(v1, param0); } @@ -380,7 +380,7 @@ int ov23_0224F69C (int param0, void * param1) static int ov23_0224F6B4 (void * param0) { UnkStruct_ov23_02250CD4 * v0 = param0; - UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(v0->unk_0C)); + UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->unk_0C)); return sub_02028D58(v1); } @@ -388,7 +388,7 @@ static int ov23_0224F6B4 (void * param0) int ov23_0224F6C8 (int param0, void * param1) { UnkStruct_ov23_02250CD4 * v0 = param1; - UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(v0->unk_0C)); + UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->unk_0C)); return sub_02028D74(v1, param0); } @@ -498,7 +498,7 @@ static void ov23_0224F7F4 (UnkStruct_ov23_02250CD4 * param0) for (v4 = 0; v4 < NELEMS(Unk_ov23_02256924); v4++) { if (v4 == v1) { - const TrainerInfo * v5 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_0C)); + const TrainerInfo * v5 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_0C)); Strbuf* v6 = TrainerInfo_NameNewStrbuf(v5, 4); sub_02013A6C(param0->unk_40, v6, Unk_ov23_02256924[v4].unk_04); @@ -1419,7 +1419,7 @@ static void ov23_02250A14 (UnkStruct_ov23_02250CD4 * param0) { ov23_0224FB7C(param0); ov23_02253968(); - ov23_02253834(param0->unk_0C->unk_08, SaveData_GetTrainerInfo(sub_0203D174(param0->unk_0C)), ov23_02250A0C, param0, 1); + ov23_02253834(param0->unk_0C->unk_08, SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_0C)), ov23_02250A0C, param0, 1); param0->unk_2AA = 10; } @@ -1561,7 +1561,7 @@ static void ov23_02250C74 (UnkStruct_0200112C * param0, u32 param1, u8 param2) { UnkStruct_ov23_02250CD4 * v0 = (UnkStruct_ov23_02250CD4 *)sub_02001504(param0, 19); int v1 = param1; - UnkStruct_020298B0 * v2 = sub_020298B0(sub_0203D174(v0->unk_0C)); + UndergroundData * v2 = sub_020298B0(FieldSystem_SaveData(v0->unk_0C)); if (!sub_02028AFC(v2, v1)) { sub_0200147C(param0, 1, 15, 2); diff --git a/src/overlay023/ov23_0225128C.c b/src/overlay023/ov23_0225128C.c index 0ebb3170c6..437fcc31bc 100644 --- a/src/overlay023/ov23_0225128C.c +++ b/src/overlay023/ov23_0225128C.c @@ -235,7 +235,7 @@ int ov23_02251414 (void) static BOOL ov23_02251418 (int param0, UnkStruct_ov23_02250CD4 * param1) { - UnkStruct_020298B0 * v0 = sub_020298B0(sub_0203D174(param1->unk_0C)); + UndergroundData * v0 = sub_020298B0(FieldSystem_SaveData(param1->unk_0C)); int v1; v1 = sub_02028B88(v0, param0); @@ -250,7 +250,7 @@ static BOOL ov23_02251418 (int param0, UnkStruct_ov23_02250CD4 * param1) static int ov23_0225144C (int param0, UnkStruct_ov23_02250CD4 * param1) { - UnkStruct_020298B0 * v0 = sub_020298B0(sub_0203D174(param1->unk_0C)); + UndergroundData * v0 = sub_020298B0(FieldSystem_SaveData(param1->unk_0C)); int v1; if (sub_02028AFC(v0, param0)) { @@ -312,7 +312,7 @@ static BOOL ov23_022514D8 (SysTask * param0, void * param1) break; case 0: { - UnkStruct_020298B0 * v4 = sub_020298B0(v0->unk_0C->unk_0C); + UndergroundData * v4 = sub_020298B0(v0->unk_0C->unk_0C); if (0 == sub_020289A0(v4)) { ov23_02253F40(ov23_022421BC(), 60, 0, NULL); @@ -355,7 +355,7 @@ static void ov23_022515D8 (UnkStruct_ov23_02250CD4 * param0, int param1, int par int v1 = param2 + 1; BOOL v2 = 1; - if (3 > sub_0202958C(sub_020298A0(param0->unk_0C->unk_0C))) { + if (3 > sub_0202958C(SaveData_SecretBaseRecord(param0->unk_0C->unk_0C))) { v2 = 0; v1 -= 1; } @@ -711,7 +711,7 @@ static void ov23_02251C04 (SysTask * param0, void * param1) case 6: ov23_0224FB7C(param1); ov23_02254044(ov23_022421BC()); - v0->unk_270 = ov23_02253C64(v0->unk_0C->unk_08, SaveData_GetTrainerInfo(sub_0203D174(v0->unk_0C)), sub_020298B0(sub_0203D174(v0->unk_0C)), NULL, NULL); + v0->unk_270 = ov23_02253C64(v0->unk_0C->unk_08, SaveData_GetTrainerInfo(FieldSystem_SaveData(v0->unk_0C)), sub_020298B0(FieldSystem_SaveData(v0->unk_0C)), NULL, NULL); v0->unk_2AA = 7; break; case 7: diff --git a/src/overlay023/ov23_022521F0.c b/src/overlay023/ov23_022521F0.c index 7ae196c45b..da099e9dec 100644 --- a/src/overlay023/ov23_022521F0.c +++ b/src/overlay023/ov23_022521F0.c @@ -91,7 +91,7 @@ static void ov23_022521F0 (UnkStruct_ov23_02250CD4 * param0, int param1) { MATHRandContext16 v0; int v1, v2, v3, v4, v5; - UnkStruct_020298B0 * v6 = sub_020298B0(sub_0203D174(param0->unk_0C)); + UndergroundData * v6 = sub_020298B0(FieldSystem_SaveData(param0->unk_0C)); MATH_InitRand16(&v0, sub_02028930(v6) + param1); @@ -136,8 +136,8 @@ static void ov23_022522F0 (UnkStruct_ov23_02250CD4 * param0, int param1) { MATHRandContext16 v0; int v1, v2, v3, v4, v5; - SaveData * v6 = sub_0203D174(param0->unk_0C); - UnkStruct_020298B0 * v7 = sub_020298B0(v6); + SaveData * v6 = FieldSystem_SaveData(param0->unk_0C); + UndergroundData * v7 = sub_020298B0(v6); BOOL v8 = sub_02027474(sub_02027560(v6)); MATH_InitRand16(&v0, sub_02028930(v7) + param1); @@ -181,7 +181,7 @@ static void ov23_022522F0 (UnkStruct_ov23_02250CD4 * param0, int param1) static int ov23_02252404 (UnkStruct_ov23_02250CD4 * param0, int param1, int param2) { BOOL v0 = 0; - UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(param0->unk_0C)); + UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(param0->unk_0C)); if (param0->unk_279[param1] != ov23_0224F684(param2, param0)) { return 0xfffd; @@ -304,7 +304,7 @@ static void ov23_02252754 (UnkStruct_0200112C * param0, u32 param1, u8 param2) { MATHRandContext16 v0; UnkStruct_ov23_02250CD4 * v1 = (UnkStruct_ov23_02250CD4 *)sub_02001504(param0, 19); - UnkStruct_020298B0 * v2 = sub_020298B0(sub_0203D174(v1->unk_0C)); + UndergroundData * v2 = sub_020298B0(FieldSystem_SaveData(v1->unk_0C)); int v3 = param1, v4, v5; int v6, v7 = 0, v8; @@ -479,7 +479,7 @@ static void ov23_02252BB8 (int param0, UnkStruct_ov23_02250CD4 * param1) static u32 ov23_02252C08 (UnkStruct_ov23_02250CD4 * param0) { - UnkStruct_020298B0 * v0 = sub_020298B0(sub_0203D174(param0->unk_0C)); + UndergroundData * v0 = sub_020298B0(FieldSystem_SaveData(param0->unk_0C)); if (ov23_0224F6E0(param0->unk_279[0], param0->unk_27E[0])) { if (param0->unk_2AC == 1) { diff --git a/src/overlay023/ov23_02253598.c b/src/overlay023/ov23_02253598.c index 1a5674b086..fc53824c87 100644 --- a/src/overlay023/ov23_02253598.c +++ b/src/overlay023/ov23_02253598.c @@ -40,7 +40,7 @@ #include "overlay023/ov23_02253598.h" #include "overlay023/ov23_02253D40.h" -typedef int (* UnkFuncPtr_ov23_022576EC)(const UnkStruct_0202855C *); +typedef int (* UnkFuncPtr_ov23_022576EC)(const SecretBaseRecord *); typedef struct { UnkFuncPtr_ov23_02253834 unk_00; @@ -57,8 +57,8 @@ typedef struct UnkStruct_ov23_02253598_t { UnkStruct_ov23_022537D4 * unk_00; SysTask * unk_04; SaveData * unk_08; - UnkStruct_0202855C * unk_0C; - UnkStruct_0202855C * unk_10; + SecretBaseRecord * unk_0C; + SecretBaseRecord * unk_10; MATHRandContext32 unk_14; u8 unk_2C; }; @@ -66,7 +66,7 @@ typedef struct UnkStruct_ov23_02253598_t { static UnkStruct_ov23_02253598 * Unk_ov23_022577BC = NULL; static void ov23_022537D4(SysTask * param0, void * param1); -void ov23_02253598 (UnkStruct_ov23_02253598 * param0, UnkStruct_0202855C * param1, SaveData * param2) +void ov23_02253598 (UnkStruct_ov23_02253598 * param0, SecretBaseRecord * param1, SaveData * param2) { MI_CpuFill8(param0, 0, sizeof(UnkStruct_ov23_02253598)); @@ -120,7 +120,7 @@ static UnkFuncPtr_ov23_022576EC Unk_ov23_022576EC[] = { sub_020295B8 }; -asm static void ov23_0225360C (Window * param0, MessageLoader * param1, TrainerInfo * param2, const UnkStruct_0202855C * param3) +asm static void ov23_0225360C (Window * param0, MessageLoader * param1, TrainerInfo * param2, const SecretBaseRecord * param3) { push {r3, r4, r5, r6, r7, lr} sub sp, #0x20 @@ -356,7 +356,7 @@ static void ov23_0225381C (SysTask * param0, void * param1) void ov23_02253834 (BGL * param0, TrainerInfo * param1, UnkFuncPtr_ov23_02253834 param2, void * param3, BOOL param4) { - UnkStruct_0202855C * v0; + SecretBaseRecord * v0; MessageLoader * v1; UnkStruct_ov84_02240FA8 v2; int v3 = 10; @@ -452,10 +452,10 @@ static void ov23_022539F8 (int param0) sub_02059514(); } -void ov23_02253A00 (UnkStruct_0202855C * param0, int param1) +void ov23_02253A00 (SecretBaseRecord * param0, int param1) { s32 v0; - UnkStruct_0202855C * v1; + SecretBaseRecord * v1; UnkFuncPtr_ov23_022576EC v2 = Unk_ov23_022576EC[param1 - 32]; GF_ASSERT(param1 >= 32); @@ -474,7 +474,7 @@ void ov23_02253A00 (UnkStruct_0202855C * param0, int param1) ov23_02253F40(ov23_022421BC(), param1, 1, ov23_022539F8); } -static void ov23_02253A78 (Window * param0, MessageLoader * param1, TrainerInfo * param2, const UnkStruct_0202855C * param3, const UnkStruct_020298B0 * param4) +static void ov23_02253A78 (Window * param0, MessageLoader * param1, TrainerInfo * param2, const SecretBaseRecord * param3, const UndergroundData * param4) { StringFormatter * v0; Strbuf* v1; @@ -537,9 +537,9 @@ static void ov23_02253A78 (Window * param0, MessageLoader * param1, TrainerInfo sub_0200B3F0(v0); } -void * ov23_02253C64 (BGL * param0, TrainerInfo * param1, UnkStruct_020298B0 * param2, UnkFuncPtr_ov23_02253834 param3, void * param4) +void * ov23_02253C64 (BGL * param0, TrainerInfo * param1, UndergroundData * param2, UnkFuncPtr_ov23_02253834 param3, void * param4) { - UnkStruct_0202855C * v0; + SecretBaseRecord * v0; MessageLoader * v1; UnkStruct_ov84_02240FA8 v2; int v3 = 10; diff --git a/src/overlay023/ov23_022542CC.c b/src/overlay023/ov23_022542CC.c index 4c0263df0d..b64007b03e 100644 --- a/src/overlay023/ov23_022542CC.c +++ b/src/overlay023/ov23_022542CC.c @@ -368,11 +368,11 @@ static void ov23_0225461C (UnkStruct_ov23_02254594 * param0) static void ov23_022546A0 (UnkStruct_0200112C * param0, u32 param1, u8 param2) { int v0; - UnkStruct_020298B0 * v1; + UndergroundData * v1; u32 v2; u32 v3; - v1 = (UnkStruct_020298B0 *)sub_02001504(param0, 19); + v1 = (UndergroundData *)sub_02001504(param0, 19); v3 = sub_02001504(param0, 2); v2 = (param1 >> 1); @@ -388,7 +388,7 @@ static void ov23_022546A0 (UnkStruct_0200112C * param0, u32 param1, u8 param2) static void ov23_022546E0 (UnkStruct_ov23_02254594 * param0) { - UnkStruct_020298B0 * v0; + UndergroundData * v0; UnkStruct_ov84_02240FA8 v1; int v2, v3; int v4; diff --git a/src/overlay023/ov23_02254A14.c b/src/overlay023/ov23_02254A14.c index 6966d3a6ab..8f4f221458 100644 --- a/src/overlay023/ov23_02254A14.c +++ b/src/overlay023/ov23_02254A14.c @@ -286,7 +286,7 @@ static BOOL ov23_02254C84 (UnkStruct_020508D4 * param0) switch (ov23_02254314(v2->unk_504)) { case 0: { - UnkStruct_020298B0 * v3; + UndergroundData * v3; int v4; v3 = sub_020298B0(v1->unk_0C); @@ -369,7 +369,7 @@ static BOOL ov23_02254DF8 (UnkStruct_020508D4 * param0) if (v7) { u32 v8; int v9; - UnkStruct_020298B0 * v10; + UndergroundData * v10; v10 = sub_020298B0(v6->unk_500->unk_0C); v8 = ov23_022545D8(v6->unk_508); @@ -473,7 +473,7 @@ static BOOL ov23_02254DF8 (UnkStruct_020508D4 * param0) if (v15) { u32 v16; int v17; - UnkStruct_020298B0 * v18; + UndergroundData * v18; v18 = sub_020298B0(v6->unk_500->unk_0C); v17 = ov23_02255B78(&v6->unk_3C, v6->unk_5C); @@ -671,7 +671,7 @@ static BOOL ov23_02255100 (UnkStruct_020508D4 * param0) v7->unk_04 = 2; } } else { - UnkStruct_020298B0 * v17; + UndergroundData * v17; v17 = sub_020298B0(v7->unk_500->unk_0C); diff --git a/src/overlay118/ov118_021D0D80.c b/src/overlay118/ov118_021D0D80.c index c6b753c408..6481bebffa 100644 --- a/src/overlay118/ov118_021D0D80.c +++ b/src/overlay118/ov118_021D0D80.c @@ -97,7 +97,7 @@ int ov118_021D0DBC (GameWindowLayout * param0) break; } - sub_0202736C(sub_02027560(sub_0203D174(param0->unk_5A4->unk_1C)), v1); + sub_0202736C(sub_02027560(FieldSystem_SaveData(param0->unk_5A4->unk_1C)), v1); } v0->unk_00++; break; diff --git a/src/unk_0202854C.c b/src/unk_0202854C.c index 388d3d5cb7..6a8149b031 100644 --- a/src/unk_0202854C.c +++ b/src/unk_0202854C.c @@ -19,7 +19,7 @@ #include "trainer_info.h" #include "unk_0202854C.h" -static void sub_02028B48(UnkStruct_020298B0 * param0, int param1, int param2); +static void sub_02028B48(UndergroundData * param0, int param1, int param2); u16 Unk_02100920[] = { 0x6E, @@ -75,7 +75,7 @@ u16 Unk_02100920[] = { int Underground_SaveSize (void) { - return sizeof(UnkStruct_020298B0); + return sizeof(UndergroundData); } int sub_02028554 (void) @@ -85,19 +85,19 @@ int sub_02028554 (void) int sub_02028558 (void) { - return sizeof(UnkStruct_0202855C); + return sizeof(SecretBaseRecord); } -UnkStruct_0202855C * sub_0202855C (u32 param0) +SecretBaseRecord * sub_0202855C (u32 param0) { - UnkStruct_0202855C * v0; + SecretBaseRecord * v0; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_0202855C)); - MI_CpuFill8(v0, 0, sizeof(UnkStruct_0202855C)); + v0 = Heap_AllocFromHeap(param0, sizeof(SecretBaseRecord)); + MI_CpuFill8(v0, 0, sizeof(SecretBaseRecord)); return v0; } -void Underground_Init (UnkStruct_020298B0 * param0) +void Underground_Init (UndergroundData * param0) { u32 v0 = 0; RTCDate v1; @@ -106,13 +106,13 @@ void Underground_Init (UnkStruct_020298B0 * param0) GetCurrentDateTime(&v1, &v2); v0 = (((((((u32)v1.year * 32ULL + v1.month) * 32ULL) + v1.day) * 32ULL + v2.hour) * 32ULL + v2.minute) * 32ULL + (v2.second + gCoreSys.frameCounter)); - MI_CpuFill8(param0, 0, sizeof(UnkStruct_020298B0)); + MI_CpuFill8(param0, 0, sizeof(UndergroundData)); param0->unk_90 = v0; param0->unk_9AC_0 = 1; } -static int sub_020285D8 (UnkStruct_020298B0 * param0) +static int sub_020285D8 (UndergroundData * param0) { int v0; @@ -125,7 +125,7 @@ static int sub_020285D8 (UnkStruct_020298B0 * param0) return -1; } -static int sub_020285F8 (UnkStruct_020298B0 * param0) +static int sub_020285F8 (UndergroundData * param0) { int v0; @@ -138,7 +138,7 @@ static int sub_020285F8 (UnkStruct_020298B0 * param0) return -1; } -static int sub_02028618 (UnkStruct_020298B0 * param0) +static int sub_02028618 (UndergroundData * param0) { int v0; @@ -151,7 +151,7 @@ static int sub_02028618 (UnkStruct_020298B0 * param0) return -1; } -static int sub_02028638 (UnkStruct_020298B0 * param0) +static int sub_02028638 (UndergroundData * param0) { int v0; @@ -166,7 +166,7 @@ static int sub_02028638 (UnkStruct_020298B0 * param0) void sub_02028658 (SaveData * param0, int param1) { - UnkStruct_020298B0 * v0 = sub_020298B0(param0); + UndergroundData * v0 = sub_020298B0(param0); MATHRandContext16 v1; u8 v2[] = {0, 2, 2, 4, 4, 5}; u8 v3[] = {0, 1, 1, 3, 3, 5}; @@ -205,7 +205,7 @@ void sub_02028658 (SaveData * param0, int param1) void sub_02028758 (SaveData * param0, s32 param1, BOOL param2) { - UnkStruct_020298B0 * v0 = sub_020298B0(param0); + UndergroundData * v0 = sub_020298B0(param0); if ((param1 < 0) || (param2)) { return; @@ -220,7 +220,7 @@ void sub_02028758 (SaveData * param0, s32 param1, BOOL param2) void sub_0202878C (SaveData * param0) { - UnkStruct_020298B0 * v0 = sub_020298B0(param0); + UndergroundData * v0 = sub_020298B0(param0); if ((v0->unk_94 == 0) && (v0->unk_98 == 2)) { v0->unk_98 = 0; @@ -237,7 +237,7 @@ void sub_0202878C (SaveData * param0) void sub_020287E0 (SaveData * param0) { - UnkStruct_020298B0 * v0 = sub_020298B0(param0); + UndergroundData * v0 = sub_020298B0(param0); if (v0->unk_98 == 0) { v0->unk_98 = 1; @@ -246,7 +246,7 @@ void sub_020287E0 (SaveData * param0) void sub_020287F8 (SaveData * param0) { - UnkStruct_020298B0 * v0 = sub_020298B0(param0); + UndergroundData * v0 = sub_020298B0(param0); if (v0->unk_98 == 1) { v0->unk_98 = 0; @@ -255,7 +255,7 @@ void sub_020287F8 (SaveData * param0) BOOL sub_02028810 (SaveData * param0) { - UnkStruct_020298B0 * v0 = sub_020298B0(param0); + UndergroundData * v0 = sub_020298B0(param0); if (v0->unk_98 == 2) { return 0; @@ -264,12 +264,12 @@ BOOL sub_02028810 (SaveData * param0) return 1; } -void sub_02028828 (UnkStruct_020298B0 * param0) +void sub_02028828 (UndergroundData * param0) { param0->unk_99 = 1; } -void sub_02028830 (UnkStruct_020298B0 * param0, const TrainerInfo * param1) +void sub_02028830 (UndergroundData * param0, const TrainerInfo * param1) { int v0 = param0->unk_10A; int v1; @@ -293,7 +293,7 @@ void sub_02028830 (UnkStruct_020298B0 * param0, const TrainerInfo * param1) } } -TrainerInfo * sub_020288C8 (const UnkStruct_020298B0 * param0, int param1, int param2) +TrainerInfo * sub_020288C8 (const UndergroundData * param0, int param1, int param2) { int v0 = (sizeof(u16) * (7 + 1)); int v1; @@ -318,7 +318,7 @@ TrainerInfo * sub_020288C8 (const UnkStruct_020298B0 * param0, int param1, int p return NULL; } -u32 sub_02028930 (UnkStruct_020298B0 * param0) +u32 sub_02028930 (UndergroundData * param0) { return param0->unk_90; } @@ -332,7 +332,7 @@ int sub_02028938 (int param0) return Unk_02100920[param0]; } -BOOL sub_0202895C (UnkStruct_020298B0 * param0, int param1) +BOOL sub_0202895C (UndergroundData * param0, int param1) { int v0; BOOL v1 = 0; @@ -348,7 +348,7 @@ BOOL sub_0202895C (UnkStruct_020298B0 * param0, int param1) return v1; } -BOOL sub_02028984 (UnkStruct_020298B0 * param0, int param1) +BOOL sub_02028984 (UndergroundData * param0, int param1) { int v0; @@ -361,7 +361,7 @@ BOOL sub_02028984 (UnkStruct_020298B0 * param0, int param1) return 0; } -int sub_020289A0 (UnkStruct_020298B0 * param0) +int sub_020289A0 (UndergroundData * param0) { int v0; @@ -374,12 +374,12 @@ int sub_020289A0 (UnkStruct_020298B0 * param0) return v0; } -int sub_020289B8 (UnkStruct_020298B0 * param0, int param1) +int sub_020289B8 (UndergroundData * param0, int param1) { return param0->unk_80C[param1]; } -int sub_020289C4 (UnkStruct_020298B0 * param0, int param1) +int sub_020289C4 (UndergroundData * param0, int param1) { int v0, v1, v2; @@ -398,7 +398,7 @@ int sub_020289C4 (UnkStruct_020298B0 * param0, int param1) return v2; } -void sub_02028A10 (UnkStruct_020298B0 * param0, int param1, int param2) +void sub_02028A10 (UndergroundData * param0, int param1, int param2) { int v0, v1 = 0, v2 = 0, v3 = -1; u8 v4[200]; @@ -436,7 +436,7 @@ void sub_02028A10 (UnkStruct_020298B0 * param0, int param1, int param2) } } -int sub_02028ACC (UnkStruct_020298B0 * param0, int param1, int param2) +int sub_02028ACC (UndergroundData * param0, int param1, int param2) { int v0, v1; @@ -447,7 +447,7 @@ int sub_02028ACC (UnkStruct_020298B0 * param0, int param1, int param2) return param0->unk_80C[param1]; } -BOOL sub_02028AFC (UnkStruct_020298B0 * param0, int param1) +BOOL sub_02028AFC (UndergroundData * param0, int param1) { int v0; @@ -460,7 +460,7 @@ BOOL sub_02028AFC (UnkStruct_020298B0 * param0, int param1) return 0; } -void sub_02028B20 (UnkStruct_020298B0 * param0, int param1) +void sub_02028B20 (UndergroundData * param0, int param1) { if ((param1 - 1) >= 15) { return; @@ -469,12 +469,12 @@ void sub_02028B20 (UnkStruct_020298B0 * param0, int param1) param0->unk_99C[param1 - 1] = 0; } -void sub_02028B34 (UnkStruct_020298B0 * param0) +void sub_02028B34 (UndergroundData * param0) { MI_CpuFill8(param0->unk_99C, 0, 15); } -static void sub_02028B48 (UnkStruct_020298B0 * param0, int param1, int param2) +static void sub_02028B48 (UndergroundData * param0, int param1, int param2) { int v0; @@ -485,7 +485,7 @@ static void sub_02028B48 (UnkStruct_020298B0 * param0, int param1, int param2) } } -int sub_02028B70 (UnkStruct_020298B0 * param0) +int sub_02028B70 (UndergroundData * param0) { int v0; @@ -498,12 +498,12 @@ int sub_02028B70 (UnkStruct_020298B0 * param0) return v0; } -int sub_02028B88 (UnkStruct_020298B0 * param0, int param1) +int sub_02028B88 (UndergroundData * param0, int param1) { return param0->unk_8FC[param1]; } -int sub_02028B94 (UnkStruct_020298B0 * param0, int param1) +int sub_02028B94 (UndergroundData * param0, int param1) { int v0, v1, v2; @@ -518,7 +518,7 @@ int sub_02028B94 (UnkStruct_020298B0 * param0, int param1) return v2; } -BOOL sub_02028BC8 (UnkStruct_020298B0 * param0, int param1) +BOOL sub_02028BC8 (UndergroundData * param0, int param1) { int v0; BOOL v1 = 0; @@ -533,7 +533,7 @@ BOOL sub_02028BC8 (UnkStruct_020298B0 * param0, int param1) return v1; } -void sub_02028BE8 (UnkStruct_020298B0 * param0, int param1, int param2) +void sub_02028BE8 (UndergroundData * param0, int param1, int param2) { int v0, v1 = 0, v2 = 0; u8 v3[40]; @@ -553,7 +553,7 @@ void sub_02028BE8 (UnkStruct_020298B0 * param0, int param1, int param2) } } -int sub_02028C3C (UnkStruct_020298B0 * param0) +int sub_02028C3C (UndergroundData * param0) { int v0; @@ -566,17 +566,17 @@ int sub_02028C3C (UnkStruct_020298B0 * param0) return v0; } -int sub_02028C54 (UnkStruct_020298B0 * param0, int param1) +int sub_02028C54 (UndergroundData * param0, int param1) { return param0->unk_94C[param1]; } -int sub_02028C60 (UnkStruct_020298B0 * param0, int param1) +int sub_02028C60 (UndergroundData * param0, int param1) { return param0->unk_974[param1]; } -int sub_02028C6C (UnkStruct_020298B0 * param0, int param1) +int sub_02028C6C (UndergroundData * param0, int param1) { int v0, v1, v2; @@ -593,7 +593,7 @@ int sub_02028C6C (UnkStruct_020298B0 * param0, int param1) return v2; } -BOOL sub_02028CB0 (UnkStruct_020298B0 * param0, int param1, int param2) +BOOL sub_02028CB0 (UndergroundData * param0, int param1, int param2) { int v0; BOOL v1 = 0; @@ -609,7 +609,7 @@ BOOL sub_02028CB0 (UnkStruct_020298B0 * param0, int param1, int param2) return v1; } -void sub_02028CD8 (UnkStruct_020298B0 * param0, int param1, int param2) +void sub_02028CD8 (UndergroundData * param0, int param1, int param2) { int v0, v1 = 0, v2 = 0; u8 v3[40]; @@ -633,7 +633,7 @@ void sub_02028CD8 (UnkStruct_020298B0 * param0, int param1, int param2) } } -int sub_02028D58 (UnkStruct_020298B0 * param0) +int sub_02028D58 (UndergroundData * param0) { int v0; @@ -646,12 +646,12 @@ int sub_02028D58 (UnkStruct_020298B0 * param0) return v0; } -int sub_02028D74 (UnkStruct_020298B0 * param0, int param1) +int sub_02028D74 (UndergroundData * param0, int param1) { return param0->unk_924[param1]; } -int sub_02028D80 (UnkStruct_020298B0 * param0, int param1) +int sub_02028D80 (UndergroundData * param0, int param1) { int v0, v1, v2; @@ -667,7 +667,7 @@ int sub_02028D80 (UnkStruct_020298B0 * param0, int param1) return v2; } -BOOL sub_02028DB4 (UnkStruct_020298B0 * param0, int param1) +BOOL sub_02028DB4 (UndergroundData * param0, int param1) { int v0; BOOL v1 = 0; @@ -682,7 +682,7 @@ BOOL sub_02028DB4 (UnkStruct_020298B0 * param0, int param1) return v1; } -void sub_02028DD8 (UnkStruct_020298B0 * param0, int param1, int param2) +void sub_02028DD8 (UndergroundData * param0, int param1, int param2) { int v0, v1 = 0, v2 = 0; u8 v3[40]; @@ -702,7 +702,7 @@ void sub_02028DD8 (UnkStruct_020298B0 * param0, int param1, int param2) } } -int sub_02028E28 (UnkStruct_020298B0 * param0) +int sub_02028E28 (UndergroundData * param0) { int v0; @@ -715,14 +715,14 @@ int sub_02028E28 (UnkStruct_020298B0 * param0) return v0; } -int sub_02028E44 (UnkStruct_020298B0 * param0, int param1) +int sub_02028E44 (UndergroundData * param0, int param1) { int v0; return param0->unk_8D4[param1]; } -int sub_02028E50 (UnkStruct_020298B0 * param0, int param1) +int sub_02028E50 (UndergroundData * param0, int param1) { int v0, v1, v2; @@ -738,7 +738,7 @@ int sub_02028E50 (UnkStruct_020298B0 * param0, int param1) return v2; } -BOOL sub_02028E84 (UnkStruct_020298B0 * param0, int param1) +BOOL sub_02028E84 (UndergroundData * param0, int param1) { int v0; BOOL v1 = 0; @@ -753,7 +753,7 @@ BOOL sub_02028E84 (UnkStruct_020298B0 * param0, int param1) return v1; } -void sub_02028EA8 (UnkStruct_020298B0 * param0, int param1, int param2) +void sub_02028EA8 (UndergroundData * param0, int param1, int param2) { int v0, v1 = 0, v2 = 0; u8 v3[40]; @@ -773,7 +773,7 @@ void sub_02028EA8 (UnkStruct_020298B0 * param0, int param1, int param2) } } -void sub_02028EF8 (UnkStruct_020298B0 * param0, int param1, int param2, int param3, int param4) +void sub_02028EF8 (UndergroundData * param0, int param1, int param2, int param3, int param4) { GF_ASSERT(param2 < (16 * 4)); @@ -783,13 +783,13 @@ void sub_02028EF8 (UnkStruct_020298B0 * param0, int param1, int param2, int para param0->unk_14B[param2][2] = param4; } -int sub_02028F40 (UnkStruct_020298B0 * param0, int param1) +int sub_02028F40 (UndergroundData * param0, int param1) { GF_ASSERT(param1 < (16 * 4)); return param0->unk_10B[param1]; } -int sub_02028F5C (UnkStruct_020298B0 * param0, int param1) +int sub_02028F5C (UndergroundData * param0, int param1) { int v0; @@ -801,7 +801,7 @@ int sub_02028F5C (UnkStruct_020298B0 * param0, int param1) return v0; } -int sub_02028F88 (UnkStruct_020298B0 * param0, int param1) +int sub_02028F88 (UndergroundData * param0, int param1) { int v0; @@ -813,7 +813,7 @@ int sub_02028F88 (UnkStruct_020298B0 * param0, int param1) return v0; } -void sub_02028FB4 (UnkStruct_020298B0 * param0, int param1) +void sub_02028FB4 (UndergroundData * param0, int param1) { GF_ASSERT(param1 < (16 * 4)); @@ -821,7 +821,7 @@ void sub_02028FB4 (UnkStruct_020298B0 * param0, int param1) MI_CpuClear8(param0->unk_14B[param1], 3); } -void sub_02028FE0 (UnkStruct_020298B0 * param0, int param1, int param2, int param3, int param4, int param5) +void sub_02028FE0 (UndergroundData * param0, int param1, int param2, int param3, int param4, int param5) { GF_ASSERT(param2 < 16); @@ -832,12 +832,12 @@ void sub_02028FE0 (UnkStruct_020298B0 * param0, int param1, int param2, int para param0->unk_548[param2] = param5; } -int sub_02029030 (UnkStruct_020298B0 * param0, int param1) +int sub_02029030 (UndergroundData * param0, int param1) { return param0->unk_508[param1]; } -int sub_0202903C (UnkStruct_020298B0 * param0, int param1) +int sub_0202903C (UndergroundData * param0, int param1) { int v0 = param0->unk_518[param1][0]; @@ -845,7 +845,7 @@ int sub_0202903C (UnkStruct_020298B0 * param0, int param1) return v0; } -int sub_0202905C (UnkStruct_020298B0 * param0, int param1) +int sub_0202905C (UndergroundData * param0, int param1) { int v0 = param0->unk_518[param1][2]; @@ -853,12 +853,12 @@ int sub_0202905C (UnkStruct_020298B0 * param0, int param1) return v0; } -int sub_0202907C (UnkStruct_020298B0 * param0, int param1) +int sub_0202907C (UndergroundData * param0, int param1) { return param0->unk_548[param1]; } -void sub_02029088 (UnkStruct_020298B0 * param0, int param1, int param2, int param3, int param4, int param5, int param6) +void sub_02029088 (UndergroundData * param0, int param1, int param2, int param3, int param4, int param5, int param6) { GF_ASSERT(param2 < 100); @@ -870,12 +870,12 @@ void sub_02029088 (UnkStruct_020298B0 * param0, int param1, int param2, int para param0->unk_5BC[param2] = param6; } -int sub_020290DC (UnkStruct_020298B0 * param0, int param1) +int sub_020290DC (UndergroundData * param0, int param1) { return param0->unk_558[param1]; } -int sub_020290E8 (UnkStruct_020298B0 * param0, int param1) +int sub_020290E8 (UndergroundData * param0, int param1) { int v0 = param0->unk_684[param1][0]; @@ -883,7 +883,7 @@ int sub_020290E8 (UnkStruct_020298B0 * param0, int param1) return v0; } -int sub_02029108 (UnkStruct_020298B0 * param0, int param1) +int sub_02029108 (UndergroundData * param0, int param1) { int v0 = param0->unk_684[param1][2]; @@ -891,17 +891,17 @@ int sub_02029108 (UnkStruct_020298B0 * param0, int param1) return v0; } -int sub_02029128 (UnkStruct_020298B0 * param0, int param1) +int sub_02029128 (UndergroundData * param0, int param1) { return param0->unk_620[param1]; } -int sub_02029134 (UnkStruct_020298B0 * param0, int param1) +int sub_02029134 (UndergroundData * param0, int param1) { return param0->unk_5BC[param1]; } -int sub_02029140 (UnkStruct_020298B0 * param0, int param1, int param2) +int sub_02029140 (UndergroundData * param0, int param1, int param2) { int v0; @@ -921,13 +921,13 @@ int sub_02029140 (UnkStruct_020298B0 * param0, int param1, int param2) return v0; } -void sub_020291A4 (UnkStruct_020298B0 * param0, int param1) +void sub_020291A4 (UndergroundData * param0, int param1) { GF_ASSERT(param1 < 255); MI_CpuFill8(param0->unk_20B[param1], 0, 3); } -int sub_020291CC (UnkStruct_020298B0 * param0, int param1) +int sub_020291CC (UndergroundData * param0, int param1) { int v0 = param0->unk_20B[param1][0]; @@ -935,7 +935,7 @@ int sub_020291CC (UnkStruct_020298B0 * param0, int param1) return v0; } -int sub_020291EC (UnkStruct_020298B0 * param0, int param1) +int sub_020291EC (UndergroundData * param0, int param1) { int v0 = param0->unk_20B[param1][2]; @@ -943,27 +943,27 @@ int sub_020291EC (UnkStruct_020298B0 * param0, int param1) return v0; } -BOOL sub_0202920C (UnkStruct_020298B0 * param0) +BOOL sub_0202920C (UndergroundData * param0) { return param0->unk_9AC_4 == 0; } -void sub_02029220 (UnkStruct_020298B0 * param0) +void sub_02029220 (UndergroundData * param0) { param0->unk_9AC_4 = 1; } -BOOL sub_02029234 (UnkStruct_020298B0 * param0) +BOOL sub_02029234 (UndergroundData * param0) { return param0->unk_9AC_0; } -void sub_02029240 (UnkStruct_020298B0 * param0) +void sub_02029240 (UndergroundData * param0) { param0->unk_9AC_0 = 0; } -void sub_02029250 (UnkStruct_020298B0 * param0, int param1) +void sub_02029250 (UndergroundData * param0, int param1) { if ((44 > param1) || (param1 > 59)) { return; @@ -972,7 +972,7 @@ void sub_02029250 (UnkStruct_020298B0 * param0, int param1) param0->unk_808 |= (0x1 << (param1 - 44)); } -BOOL sub_02029274 (UnkStruct_020298B0 * param0, int param1) +BOOL sub_02029274 (UndergroundData * param0, int param1) { if ((44 > param1) || (param1 > 59)) { return 1; @@ -985,7 +985,7 @@ BOOL sub_02029274 (UnkStruct_020298B0 * param0, int param1) return 1; } -void sub_0202929C (UnkStruct_020298B0 * param0) +void sub_0202929C (UndergroundData * param0) { if (param0->unk_9AB >= (100 - 1)) { param0->unk_9AB = 0; @@ -994,7 +994,7 @@ void sub_0202929C (UnkStruct_020298B0 * param0) } } -int sub_020292B4 (UnkStruct_020298B0 * param0) +int sub_020292B4 (UndergroundData * param0) { return param0->unk_9AB; } @@ -1133,12 +1133,12 @@ int sub_0202948C (const UnkStruct_02029894 * param0) return 10; } -int sub_020294B8 (const UnkStruct_0202855C * param0) +int sub_020294B8 (const SecretBaseRecord * param0) { return param0->unk_00_0; } -int sub_020294C0 (const UnkStruct_0202855C * param0) +int sub_020294C0 (const SecretBaseRecord * param0) { if (4 == sub_0202958C(param0)) { return 1; @@ -1147,43 +1147,43 @@ int sub_020294C0 (const UnkStruct_0202855C * param0) return 0; } -void sub_020294D4 (UnkStruct_0202855C * param0, int param1) +void sub_020294D4 (SecretBaseRecord * param0, int param1) { param0->unk_00_0 = param1; } -int sub_020294EC (const UnkStruct_0202855C * param0) +int sub_020294EC (const SecretBaseRecord * param0) { return param0->unk_04_0; } -void sub_020294F4 (UnkStruct_0202855C * param0, int param1) +void sub_020294F4 (SecretBaseRecord * param0, int param1) { if (param0->unk_04_0 < 999999) { param0->unk_04_0++; } } -int sub_02029524 (const UnkStruct_0202855C * param0) +int sub_02029524 (const SecretBaseRecord * param0) { return param0->unk_08_0; } -void sub_0202952C (UnkStruct_0202855C * param0) +void sub_0202952C (SecretBaseRecord * param0) { if (param0->unk_08_0 < 999999) { param0->unk_08_0++; } } -void sub_0202955C (UnkStruct_0202855C * param0) +void sub_0202955C (SecretBaseRecord * param0) { if (param0->unk_0C_0 < 999999) { param0->unk_0C_0++; } } -int sub_0202958C (const UnkStruct_0202855C * param0) +int sub_0202958C (const SecretBaseRecord * param0) { int v0 = param0->unk_38_0; @@ -1200,24 +1200,24 @@ int sub_0202958C (const UnkStruct_0202855C * param0) return 0; } -int sub_020295B8 (const UnkStruct_0202855C * param0) +int sub_020295B8 (const SecretBaseRecord * param0) { return param0->unk_38_0; } -void sub_020295C0 (UnkStruct_0202855C * param0) +void sub_020295C0 (SecretBaseRecord * param0) { if (param0->unk_38_0 < 999999) { param0->unk_38_0++; } } -int sub_020295F0 (const UnkStruct_0202855C * param0) +int sub_020295F0 (const SecretBaseRecord * param0) { return param0->unk_10_0; } -void sub_020295F8 (UnkStruct_0202855C * param0, int param1) +void sub_020295F8 (SecretBaseRecord * param0, int param1) { if ((param1 > 0) && (param0->unk_10_0 > (999999 - param1))) { param0->unk_10_0 = 999999; @@ -1226,12 +1226,12 @@ void sub_020295F8 (UnkStruct_0202855C * param0, int param1) } } -int sub_0202963C (const UnkStruct_0202855C * param0) +int sub_0202963C (const SecretBaseRecord * param0) { return param0->unk_14_0; } -void sub_02029644 (UnkStruct_0202855C * param0, int param1) +void sub_02029644 (SecretBaseRecord * param0, int param1) { if ((param1 > 0) && (param0->unk_14_0 > (999999 - param1))) { param0->unk_14_0 = 999999; @@ -1240,7 +1240,7 @@ void sub_02029644 (UnkStruct_0202855C * param0, int param1) } } -void sub_02029688 (UnkStruct_0202855C * param0, int param1) +void sub_02029688 (SecretBaseRecord * param0, int param1) { if ((param1 > 0) && (param0->unk_18_0 > (999999 - param1))) { param0->unk_18_0 = 999999; @@ -1249,84 +1249,84 @@ void sub_02029688 (UnkStruct_0202855C * param0, int param1) } } -int sub_020296CC (const UnkStruct_0202855C * param0) +int sub_020296CC (const SecretBaseRecord * param0) { return param0->unk_1C_0; } -void sub_020296D4 (UnkStruct_0202855C * param0) +void sub_020296D4 (SecretBaseRecord * param0) { if (param0->unk_1C_0 < 999999) { param0->unk_1C_0++; } } -int sub_02029704 (const UnkStruct_0202855C * param0) +int sub_02029704 (const SecretBaseRecord * param0) { return param0->unk_20_0; } -void sub_0202970C (UnkStruct_0202855C * param0) +void sub_0202970C (SecretBaseRecord * param0) { if (param0->unk_20_0 < 999999) { param0->unk_20_0++; } } -int sub_0202973C (const UnkStruct_0202855C * param0) +int sub_0202973C (const SecretBaseRecord * param0) { return param0->unk_24_0; } -void sub_02029744 (UnkStruct_0202855C * param0) +void sub_02029744 (SecretBaseRecord * param0) { if (param0->unk_24_0 < 999999) { param0->unk_24_0++; } } -int sub_02029774 (const UnkStruct_0202855C * param0) +int sub_02029774 (const SecretBaseRecord * param0) { return param0->unk_28_0; } -void sub_0202977C (UnkStruct_0202855C * param0) +void sub_0202977C (SecretBaseRecord * param0) { if (param0->unk_28_0 < 999999) { param0->unk_28_0++; } } -int sub_020297AC (const UnkStruct_0202855C * param0) +int sub_020297AC (const SecretBaseRecord * param0) { return param0->unk_2C_0; } -void sub_020297B4 (UnkStruct_0202855C * param0) +void sub_020297B4 (SecretBaseRecord * param0) { if (param0->unk_2C_0 < 999999) { param0->unk_2C_0++; } } -int sub_020297E4 (const UnkStruct_0202855C * param0) +int sub_020297E4 (const SecretBaseRecord * param0) { return param0->unk_30_0; } -void sub_020297EC (UnkStruct_0202855C * param0) +void sub_020297EC (SecretBaseRecord * param0) { if (param0->unk_30_0 < 999999) { param0->unk_30_0++; } } -int sub_0202981C (const UnkStruct_0202855C * param0) +int sub_0202981C (const SecretBaseRecord * param0) { return param0->unk_34_0; } -void sub_02029824 (UnkStruct_0202855C * param0) +void sub_02029824 (SecretBaseRecord * param0) { if (param0->unk_34_0 < 999999) { param0->unk_34_0++; @@ -1363,28 +1363,28 @@ BOOL sub_0202988C (const UnkStruct_02029894 * param0) UnkStruct_02029894 * sub_02029894 (SaveData * param0) { - UnkStruct_020298B0 * v0; + UndergroundData * v0; v0 = SaveData_SaveTable(param0, 12); return &v0->unk_00; } -UnkStruct_0202855C * sub_020298A0 (SaveData * param0) +SecretBaseRecord * SaveData_SecretBaseRecord (SaveData * param0) { - UnkStruct_020298B0 * v0; + UndergroundData * v0; v0 = SaveData_SaveTable(param0, 12); return &v0->unk_00.unk_50; } -UnkStruct_0202855C * sub_020298AC (UnkStruct_02029894 * param0) +SecretBaseRecord * sub_020298AC (UnkStruct_02029894 * param0) { return ¶m0->unk_50; } -UnkStruct_020298B0 * sub_020298B0 (SaveData * param0) +UndergroundData * sub_020298B0 (SaveData * param0) { - UnkStruct_020298B0 * v0; + UndergroundData * v0; v0 = SaveData_SaveTable(param0, 12); return v0; diff --git a/src/unk_0203CC84.c b/src/unk_0203CC84.c index b10784ea5a..0a68eb1979 100644 --- a/src/unk_0203CC84.c +++ b/src/unk_0203CC84.c @@ -386,7 +386,7 @@ BGL * sub_0203D170 (void * param0) return v0->unk_08; } -SaveData * sub_0203D174 (void * param0) +SaveData * FieldSystem_SaveData (void * param0) { return ((FieldSystem *)param0)->unk_0C; } diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c index a85b9e94a2..0411ae6c3f 100644 --- a/src/unk_0203D1B8.c +++ b/src/unk_0203D1B8.c @@ -793,7 +793,7 @@ void * sub_0203D8EC (FieldSystem * param0) Options * v1; v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0203D8EC)); - v1 = sub_02025E44(sub_0203D174(param0)); + v1 = sub_02025E44(FieldSystem_SaveData(param0)); sub_0203D8DC(param0, v1); @@ -811,7 +811,7 @@ UnkStruct_02097728 * sub_0203D920 (FieldSystem * param0, int param1, u8 param2, { UnkStruct_02097728 * v0; - v0 = sub_02097624(sub_0203D174(param0), param1, param2, param3, 11); + v0 = sub_02097624(FieldSystem_SaveData(param0), param1, param2, param3, 11); sub_0203D910(param0, v0); return v0; @@ -822,9 +822,9 @@ UnkStruct_02097728 * sub_0203D94C (FieldSystem * param0, int param1, u8 param2, UnkStruct_02097728 * v0; if (param1 == 3) { - v0 = sub_020976F4(sub_0203D174(param0), param2, param3); + v0 = sub_020976F4(FieldSystem_SaveData(param0), param2, param3); } else { - v0 = sub_0209767C(sub_0203D174(param0), param1, param2, param3); + v0 = sub_0209767C(FieldSystem_SaveData(param0), param1, param2, param3); } sub_0203D910(param0, v0); @@ -836,7 +836,7 @@ UnkStruct_02097728 * sub_0203D984 (FieldSystem * param0, Pokemon * param1, int p { UnkStruct_02097728 * v0; - v0 = sub_020976BC(sub_0203D174(param0), param1, param2); + v0 = sub_020976BC(FieldSystem_SaveData(param0), param1, param2); sub_0203D910(param0, v0); return v0; @@ -851,7 +851,7 @@ UnkStruct_0203D9B8 * sub_0203D9B8 (FieldSystem * param0, int param1) { UnkStruct_0203D9B8 * v0; - v0 = sub_020989DC(sub_0203D174(param0), param1); + v0 = sub_020989DC(FieldSystem_SaveData(param0), param1); sub_0203D9A8(param0, v0); return v0; diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c index ded1623f7d..98d912fb31 100644 --- a/src/unk_0203F6C4.c +++ b/src/unk_0203F6C4.c @@ -5404,8 +5404,8 @@ static BOOL sub_02043748 (UnkStruct_0203E724 * param0) LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 10); StringFormatter ** v1 = sub_0203F098(param0->unk_34, 15); u16 v2 = sub_0203E838(param0); - TrainerInfo * v3 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34)); - UnkStruct_02014EC4 * v4 = sub_02014EC4(sub_0203D174(param0->unk_34)); + TrainerInfo * v3 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); + UnkStruct_02014EC4 * v4 = sub_02014EC4(FieldSystem_SaveData(param0->unk_34)); u16 v5; if (v2 == 0) { @@ -5614,7 +5614,7 @@ static BOOL sub_02043A94 (UnkStruct_0203E724 * param0) static BOOL sub_02043AA4 (UnkStruct_0203E724 * param0) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34)); + TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); StringFormatter ** v1 = sub_0203F098(param0->unk_34, 15); sub_0205C980(TrainerInfo_ID(v0), TrainerInfo_Gender(v0), *v1); @@ -5623,7 +5623,7 @@ static BOOL sub_02043AA4 (UnkStruct_0203E724 * param0) static BOOL sub_02043AE0 (UnkStruct_0203E724 * param0) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34)); + TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); u16 v1 = inline_02049538(param0); u16 * v2 = inline_0204FCAC(param0); @@ -5635,7 +5635,7 @@ static BOOL sub_02043AE0 (UnkStruct_0203E724 * param0) static BOOL sub_02043B48 (UnkStruct_0203E724 * param0) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34)); + TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); u16 v1 = inline_02049538(param0); u16 * v2 = inline_0204FCAC(param0); @@ -5646,7 +5646,7 @@ static BOOL sub_02043B48 (UnkStruct_0203E724 * param0) static BOOL sub_02043BA0 (UnkStruct_0203E724 * param0) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34)); + TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); u16 v1 = inline_02049538(param0); TrainerInfo_SetAppearance(v0, v1); @@ -5670,7 +5670,7 @@ static BOOL sub_02043BE0 (UnkStruct_0203E724 * param0) static BOOL sub_02043C0C (UnkStruct_0203E724 * param0) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34)); + TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); u16 * v1 = inline_0204FCAC(param0); *v1 = TrainerInfo_Gender(v0); @@ -6821,7 +6821,7 @@ static BOOL sub_0204504C (UnkStruct_0203E724 * param0) static BOOL sub_02045068 (UnkStruct_0203E724 * param0) { FieldSystem * v0 = param0->unk_34; - TrainerInfo * v1 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34)); + TrainerInfo * v1 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); u16 * v2 = inline_0204FCAC(param0); PCBoxes * v3 = SaveData_PCBoxes(v0->unk_0C); u16 v4 = inline_02049538(param0); @@ -6851,10 +6851,10 @@ static BOOL sub_02045134 (UnkStruct_0203E724 * param0) { FieldSystem * v0 = param0->unk_34; SaveData * v1 = v0->unk_0C; - UnkStruct_0202855C * v2; + SecretBaseRecord * v2; u16 * v3 = inline_0204FCAC(param0); - v2 = sub_020298A0(v1); + v2 = SaveData_SecretBaseRecord(v1); *v3 = sub_020295B8(v2); return 0; @@ -7728,7 +7728,7 @@ static BOOL sub_02045EA0 (UnkStruct_0203E724 * param0) static BOOL sub_02045ECC (UnkStruct_0203E724 * param0) { u16 v0 = inline_02049538(param0); - UnkStruct_020298B0 * v1 = sub_020298B0(param0->unk_34->unk_0C); + UndergroundData * v1 = sub_020298B0(param0->unk_34->unk_0C); if ((v0 == 135) || (v0 == 136)) { sub_02028828(v1); diff --git a/src/unk_02046C7C.c b/src/unk_02046C7C.c index 0906ca6583..0a1a20d308 100644 --- a/src/unk_02046C7C.c +++ b/src/unk_02046C7C.c @@ -99,7 +99,7 @@ BOOL sub_02046CFC (UnkStruct_0203E724 * param0) Strbuf* v0; Pokemon * v1; void ** v2 = sub_0203F098(param0->unk_34, 20); - TrainerInfo * v3 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34)); + TrainerInfo * v3 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); u16 v4 = inline_02049538(param0); u16 v5 = inline_02049538(param0); u16 v6 = inline_02049538(param0); diff --git a/src/unk_020474B8.c b/src/unk_020474B8.c index c04b33991c..be92b37622 100644 --- a/src/unk_020474B8.c +++ b/src/unk_020474B8.c @@ -58,7 +58,7 @@ BOOL sub_020474F4 (UnkStruct_0203E724 * param0) StringFormatter ** v1 = sub_0203F098(v0, 15); u8 v2 = (*((param0)->unk_08++)); - sub_0200B498(*v1, v2, SaveData_GetTrainerInfo(sub_0203D174(v0))); + sub_0200B498(*v1, v2, SaveData_GetTrainerInfo(FieldSystem_SaveData(v0))); return 0; } @@ -259,7 +259,7 @@ BOOL sub_020478E4 (UnkStruct_0203E724 * param0) { int v0; FieldSystem * v1 = param0->unk_34; - TrainerInfo * v2 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34)); + TrainerInfo * v2 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); StringFormatter ** v3 = sub_0203F098(v1, 15); u8 v4 = (*((param0)->unk_08++)); diff --git a/src/unk_020494DC.c b/src/unk_020494DC.c index e8708cd50d..7d3e322158 100644 --- a/src/unk_020494DC.c +++ b/src/unk_020494DC.c @@ -37,7 +37,7 @@ BOOL sub_020494DC (UnkStruct_0203E724 * param0) v0 = sub_0203E838(param0); v1 = sub_0203E838(param0); - param0->unk_34->unk_AC = sub_0204A124(sub_0203D174(param0->unk_34), v0, v1); + param0->unk_34->unk_AC = sub_0204A124(FieldSystem_SaveData(param0->unk_34), v0, v1); return 0; } diff --git a/src/unk_02049D08.c b/src/unk_02049D08.c index 0aa08f9e7f..c852c32541 100644 --- a/src/unk_02049D08.c +++ b/src/unk_02049D08.c @@ -895,7 +895,7 @@ u16 sub_0204ABA0 (UnkStruct_0204AFC4 * param0, SaveData * param1) { u8 v0, v1; u16 v2, v3, v4; - UnkStruct_020298B0 * v5; + UndergroundData * v5; if (param0->unk_0F == 5) { return 0; diff --git a/src/unk_0204C6C8.c b/src/unk_0204C6C8.c index 9ea186a05d..bce4a1443a 100644 --- a/src/unk_0204C6C8.c +++ b/src/unk_0204C6C8.c @@ -108,7 +108,7 @@ BOOL sub_0204C7D8 (UnkStruct_0203E724 * param0) BOOL sub_0204C808 (UnkStruct_0203E724 * param0) { FieldSystem * v0 = param0->unk_34; - TrainerInfo * v1 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34)); + TrainerInfo * v1 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); SaveData * v2 = v0->unk_0C; u16 * v3 = sub_02025E50(v2); u32 v4, v5; @@ -129,7 +129,7 @@ BOOL sub_0204C808 (UnkStruct_0203E724 * param0) BOOL sub_0204C854 (UnkStruct_0203E724 * param0) { FieldSystem * v0 = param0->unk_34; - TrainerInfo * v1 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34)); + TrainerInfo * v1 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); SaveData * v2 = v0->unk_0C; u16 * v3 = sub_02025E50(v2); u16 * v4 = inline_0204FCAC(param0); diff --git a/src/unk_0204C8F0.c b/src/unk_0204C8F0.c index 8f09b9727e..d854efc83c 100644 --- a/src/unk_0204C8F0.c +++ b/src/unk_0204C8F0.c @@ -21,7 +21,7 @@ BOOL sub_0204C8F0 (UnkStruct_0203E724 * param0) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34)); + TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); u32 v1; v1 = sub_0203E850(param0); @@ -32,7 +32,7 @@ BOOL sub_0204C8F0 (UnkStruct_0203E724 * param0) BOOL sub_0204C914 (UnkStruct_0203E724 * param0) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34)); + TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); u32 v1; v1 = sub_0203E850(param0); @@ -43,7 +43,7 @@ BOOL sub_0204C914 (UnkStruct_0203E724 * param0) BOOL sub_0204C938 (UnkStruct_0203E724 * param0) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34)); + TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); u32 v1; v1 = inline_02049538(param0); @@ -54,7 +54,7 @@ BOOL sub_0204C938 (UnkStruct_0203E724 * param0) BOOL sub_0204C968 (UnkStruct_0203E724 * param0) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34)); + TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); u16 * v1; u32 v2, v3; @@ -73,7 +73,7 @@ BOOL sub_0204C968 (UnkStruct_0203E724 * param0) BOOL sub_0204C9AC (UnkStruct_0203E724 * param0) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34)); + TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); u16 * v1; u32 v2, v3; diff --git a/src/unk_0204CA84.c b/src/unk_0204CA84.c index 524102aa85..00a56cce7f 100644 --- a/src/unk_0204CA84.c +++ b/src/unk_0204CA84.c @@ -66,7 +66,7 @@ BOOL sub_0204CAEC (UnkStruct_0203E724 * param0) SaveData * v1 = v0->unk_0C; UnkStruct_02026310 * v2 = (UnkStruct_02026310 *)(SaveData_SaveTable(v1, 8)); Party * v3 = Party_GetFromSavedata(v0->unk_0C); - TrainerInfo * v4 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34)); + TrainerInfo * v4 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); ov5_021E6EA8(v2, v3, v4); return 0; diff --git a/src/unk_0204CFFC.c b/src/unk_0204CFFC.c index 1aab43d453..7a4168288f 100644 --- a/src/unk_0204CFFC.c +++ b/src/unk_0204CFFC.c @@ -69,7 +69,7 @@ BOOL sub_0204D0E8 (UnkStruct_0203E724 * param0) { FieldSystem * v0 = param0->unk_34; Pokemon * v1; - TrainerInfo * v2 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34)); + TrainerInfo * v2 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); u16 * v3 = inline_0204FCAC(param0); u16 * v4 = inline_0204FCAC(param0); u16 v5, v6; diff --git a/src/unk_0204E974.c b/src/unk_0204E974.c index 600c4c0d48..8e932c6017 100644 --- a/src/unk_0204E974.c +++ b/src/unk_0204E974.c @@ -17,7 +17,7 @@ BOOL sub_0204E974 (UnkStruct_0203E724 * param0) { FieldSystem * v0 = param0->unk_34; SaveData * v1 = v0->unk_0C; - UnkStruct_020298B0 * v2; + UndergroundData * v2; u16 v3 = inline_02049538(param0); u16 v4 = inline_02049538(param0); u16 * v5 = inline_0204FCAC(param0); @@ -42,7 +42,7 @@ BOOL sub_0204EA04 (UnkStruct_0203E724 * param0) { FieldSystem * v0 = param0->unk_34; SaveData * v1 = v0->unk_0C; - UnkStruct_020298B0 * v2; + UndergroundData * v2; u16 v3 = inline_02049538(param0); u16 v4 = inline_02049538(param0); u16 * v5 = inline_0204FCAC(param0); @@ -67,7 +67,7 @@ BOOL sub_0204EA94 (UnkStruct_0203E724 * param0) { FieldSystem * v0 = param0->unk_34; SaveData * v1 = v0->unk_0C; - UnkStruct_020298B0 * v2; + UndergroundData * v2; u16 v3 = inline_02049538(param0); u16 v4 = inline_02049538(param0); u16 * v5 = inline_0204FCAC(param0); @@ -112,7 +112,7 @@ BOOL sub_0204EB9C (UnkStruct_0203E724 * param0) { FieldSystem * v0 = param0->unk_34; SaveData * v1 = v0->unk_0C; - UnkStruct_020298B0 * v2; + UndergroundData * v2; u16 v3 = inline_02049538(param0); u16 v4 = inline_02049538(param0); u16 * v5 = inline_0204FCAC(param0); @@ -156,7 +156,7 @@ BOOL sub_0204EC98 (UnkStruct_0203E724 * param0) { FieldSystem * v0 = param0->unk_34; SaveData * v1 = v0->unk_0C; - UnkStruct_020298B0 * v2; + UndergroundData * v2; u16 v3 = inline_02049538(param0); u16 v4 = inline_02049538(param0); u16 * v5 = inline_0204FCAC(param0); diff --git a/src/unk_0204EDA4.c b/src/unk_0204EDA4.c index 1a533df228..42a5738d5b 100644 --- a/src/unk_0204EDA4.c +++ b/src/unk_0204EDA4.c @@ -83,7 +83,7 @@ static void sub_0204EE90 (UnkStruct_0203E724 * param0, u16 param1, Pokemon * par *v0 = v1; v1->unk_00 = param2; - v1->unk_04 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34)); + v1->unk_04 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34)); v1->unk_08 = sub_02025E44(param0->unk_34->unk_0C); v1->unk_0C = param3; v1->unk_15 = param1; diff --git a/src/unk_020528D0.c b/src/unk_020528D0.c index b67861847c..5e7ccb6146 100644 --- a/src/unk_020528D0.c +++ b/src/unk_020528D0.c @@ -132,7 +132,7 @@ static void sub_02052914 (FieldSystem * param0, UnkStruct_020508D4 * param1) v0->unk_20 = sub_0200B358(11); sub_0201A8D4(v0->unk_08, &v0->unk_0C, &Unk_020EC2F0); - sub_0200B498(v0->unk_20, 0, SaveData_GetTrainerInfo(sub_0203D174(param0))); + sub_0200B498(v0->unk_20, 0, SaveData_GetTrainerInfo(FieldSystem_SaveData(param0))); if (param0->unk_1C->unk_00 == 414) { sub_02052AA4(v0, 4, 0, 0); diff --git a/src/unk_020559DC.c b/src/unk_020559DC.c index 7c069162d2..253ffc0429 100644 --- a/src/unk_020559DC.c +++ b/src/unk_020559DC.c @@ -91,7 +91,7 @@ static void inline_020559DC (FieldSystem * param0, UnkStruct_02055BA8 * param1, static void sub_02055AC0 (FieldSystem * param0, s32 param1) { - sub_02028658(sub_0203D174(param0), param1); + sub_02028658(FieldSystem_SaveData(param0), param1); sub_0203F1FC(param0); sub_0206C2D0(param0->unk_0C, param1); sub_0202B3D8(sub_0202B4A0(param0->unk_0C), param1); diff --git a/src/unk_02057518.c b/src/unk_02057518.c index b432887bf5..da48cf26b8 100644 --- a/src/unk_02057518.c +++ b/src/unk_02057518.c @@ -151,13 +151,13 @@ void CommPlayerMan_Restart (void) void CommPlayerMan_Delete (BOOL deletePlayerData) { - int netId, v1; + int netId, netJd; if (sCommPlayerManager != NULL) { - for (v1 = 0; v1 < 5; v1++) { - if (sCommPlayerManager->unk_27C[v1]) { - Heap_FreeToHeap(sCommPlayerManager->unk_27C[v1]); - sCommPlayerManager->unk_27C[v1] = NULL; + for (netJd = 0; netJd < 5; netJd++) { + if (sCommPlayerManager->unk_27C[netJd]) { + Heap_FreeToHeap(sCommPlayerManager->unk_27C[netJd]); + sCommPlayerManager->unk_27C[netJd] = NULL; } } @@ -183,7 +183,7 @@ void CommPlayerMan_Delete (BOOL deletePlayerData) void CommPlayerMan_Reinit (void) { - int netId, v1; + int netId; for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) { if (sCommPlayerManager->isUnderground) { @@ -255,24 +255,24 @@ void CommPlayer_InitPersonal (void) void CommPlayer_CopyPersonal (int param0) { - int v0; + int netId; sCommPlayerManager->unk_2BF = 0; - v0 = CommSys_CurNetId(); + netId = CommSys_CurNetId(); - sCommPlayerManager->playerAvatar[v0] = sCommPlayerManager->fieldSys->playerAvatar; - sCommPlayerManager->isActive[v0] = 1; - sCommPlayerManager->playerLocation[v0].x = sCommPlayerManager->playerLocation[param0].x; - sCommPlayerManager->playerLocation[v0].z = sCommPlayerManager->playerLocation[param0].z; - sCommPlayerManager->playerLocation[v0].dir = sCommPlayerManager->playerLocation[param0].dir; - sCommPlayerManager->playerLocationServer[v0].x = sCommPlayerManager->playerLocationServer[param0].x; - sCommPlayerManager->playerLocationServer[v0].z = sCommPlayerManager->playerLocationServer[param0].z; - sCommPlayerManager->playerLocationServer[v0].dir = sCommPlayerManager->playerLocationServer[param0].dir; - sCommPlayerManager->unk_290[v0] = sCommPlayerManager->unk_290[param0]; + sCommPlayerManager->playerAvatar[netId] = sCommPlayerManager->fieldSys->playerAvatar; + sCommPlayerManager->isActive[netId] = 1; + sCommPlayerManager->playerLocation[netId].x = sCommPlayerManager->playerLocation[param0].x; + sCommPlayerManager->playerLocation[netId].z = sCommPlayerManager->playerLocation[param0].z; + sCommPlayerManager->playerLocation[netId].dir = sCommPlayerManager->playerLocation[param0].dir; + sCommPlayerManager->playerLocationServer[netId].x = sCommPlayerManager->playerLocationServer[param0].x; + sCommPlayerManager->playerLocationServer[netId].z = sCommPlayerManager->playerLocationServer[param0].z; + sCommPlayerManager->playerLocationServer[netId].dir = sCommPlayerManager->playerLocationServer[param0].dir; + sCommPlayerManager->unk_290[netId] = sCommPlayerManager->unk_290[param0]; sCommPlayerManager->unk_290[param0] = NULL; - if (sCommPlayerManager->unk_290[v0]) { - TrainerInfo_Copy(sCommPlayerManager->unk_290[v0], (TrainerInfo *)&sCommPlayerManager->unk_14A[v0].unk_00); + if (sCommPlayerManager->unk_290[netId]) { + TrainerInfo_Copy(sCommPlayerManager->unk_290[netId], (TrainerInfo *)&sCommPlayerManager->unk_14A[netId].unk_00); } sCommPlayerManager->unk_14A[param0].unk_20 = 0xff; @@ -280,48 +280,48 @@ void CommPlayer_CopyPersonal (int param0) void CommPlayer_SendXZPos (BOOL param0, int param1, int param2) { - u8 v0[5 + 1]; - int v1 = Player_Dir(sCommPlayerManager->fieldSys->playerAvatar); + u8 data[5 + 1]; + int dir = Player_Dir(sCommPlayerManager->fieldSys->playerAvatar); - v0[0] = param1; - v0[1] = param1 >> 8; - v0[2] = param2; - v0[3] = param2 >> 8; - v0[4] = v1; + data[0] = param1; + data[1] = param1 >> 8; + data[2] = param2; + data[3] = param2 >> 8; + data[4] = dir; if (param0) { - v0[4] = v0[4] | 0x80; + data[4] = data[4] | 0x80; } - sub_020360D0(22, v0); + sub_020360D0(22, data); sCommPlayerManager->unk_2BB = 1; } void CommPlayer_SendPos (BOOL param0) { - int v0 = Player_XPos(sCommPlayerManager->fieldSys->playerAvatar); - int v1 = Player_ZPos(sCommPlayerManager->fieldSys->playerAvatar); + int x = Player_XPos(sCommPlayerManager->fieldSys->playerAvatar); + int z = Player_ZPos(sCommPlayerManager->fieldSys->playerAvatar); - CommPlayer_SendXZPos(param0, v0, v1); + CommPlayer_SendXZPos(param0, x, z); } void CommPlayer_SendPosServer (BOOL param0) { - int v0 = sCommPlayerManager->playerLocationServer[CommSys_CurNetId()].x; - int v1 = sCommPlayerManager->playerLocationServer[CommSys_CurNetId()].z; + int x = sCommPlayerManager->playerLocationServer[CommSys_CurNetId()].x; + int z = sCommPlayerManager->playerLocationServer[CommSys_CurNetId()].z; - CommPlayer_SendXZPos(param0, v0, v1); + CommPlayer_SendXZPos(param0, x, z); } -static void sub_02057B48 (int param0, const CommPlayerLocation * playerLocation) +static void sub_02057B48 (int netId, const CommPlayerLocation * playerLocation) { - u8 v0[4 + 1]; - int v1 = playerLocation->x, z = playerLocation->z; + u8 data[4 + 1]; + int x = playerLocation->x, z = playerLocation->z; if (playerLocation->x < 0) { - v1 = 0; + x = 0; } else if (playerLocation->x >= 0xf000) { - v1 = 0xf000 - 1; + x = 0xf000 - 1; } if (playerLocation->z < 0) { @@ -330,25 +330,25 @@ static void sub_02057B48 (int param0, const CommPlayerLocation * playerLocation) z = 0xf000 - 1; } - v0[0] = param0 & 0xf; - v0[1] = v1; - v0[2] = ((v1 >> 8) & 0x1) + ((z >> 7) & 0x2); - v0[3] = z; + data[0] = netId & 0xf; + data[1] = x; + data[2] = ((x >> 8) & 0x1) + ((z >> 7) & 0x2); + data[3] = z; if (playerLocation->unk_07) { - v0[2] |= 0x80; + data[2] |= 0x80; } - v0[0] += ((playerLocation->dir % 4) << 4); - v0[0] += (playerLocation->moveSpeed << 6); + data[0] += ((playerLocation->dir % 4) << 4); + data[0] += (playerLocation->moveSpeed << 6); - CommSys_SendDataServer(23, v0, 0); + CommSys_SendDataServer(23, data, 0); } void sub_02057BC4 (void * param0) { int v0 = sub_0205EB0C(sCommPlayerManager->fieldSys->playerAvatar); - int v1 = sub_0205EB14(sCommPlayerManager->fieldSys->playerAvatar); + int moveState = Player_MoveState(sCommPlayerManager->fieldSys->playerAvatar); if ((0 == v0) && CommSys_IsPlayerConnected(CommSys_CurNetId())) { if (!sCommPlayerManager->unk_2BA) { @@ -357,22 +357,22 @@ void sub_02057BC4 (void * param0) } } - if ((1 == v0) && (1 == v1)) { + if ((1 == v0) && (1 == moveState)) { sCommPlayerManager->unk_2BA = 0; } } static void sub_02057C2C (void * param0) { - int v0; + int netId; - for (v0 = 0; v0 < (7 + 1); v0++) { - if (sCommPlayerManager->isActive[v0]) { - CommPlayerLocation * v1 = &sCommPlayerManager->playerLocationServer[v0]; + for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) { + if (sCommPlayerManager->isActive[netId]) { + CommPlayerLocation * location = &sCommPlayerManager->playerLocationServer[netId]; - if (sCommPlayerManager->unk_132[v0] || sCommPlayerManager->unk_2BB) { - sCommPlayerManager->unk_132[v0] = 0; - sub_02057B48(v0, v1); + if (sCommPlayerManager->unk_132[netId] || sCommPlayerManager->unk_2BB) { + sCommPlayerManager->unk_132[netId] = 0; + sub_02057B48(netId, location); } } } @@ -387,7 +387,6 @@ u32 CommPlayer_Size (void) static void CommPlayer_Add (u8 param0) { - fx32 v0, v1; PlayerAvatar * playerAvatar; if (sCommPlayerManager->playerAvatar[param0] != NULL) { @@ -450,8 +449,6 @@ static void CommPlayer_Add (u8 param0) void CommPlayer_Destroy (u8 param0, BOOL param1, BOOL param2) { - int v0; - if (sCommPlayerManager == NULL) { return; } @@ -495,13 +492,13 @@ void CommPlayer_Destroy (u8 param0, BOOL param1, BOOL param2) static void CommPlayer_SendMoveSpeed () { - u8 v0 = 2; + u8 moveSpeed = 2; if (PAD_BUTTON_B & gCoreSys.heldKeys) { - v0 = 1; + moveSpeed = 1; } - sub_02035E5C(v0); + sub_02035E5C(moveSpeed); } static void Task_CommPlayerManagerRun (SysTask * task, void * data) @@ -538,7 +535,7 @@ static void Task_CommPlayerManagerRun (SysTask * task, void * data) static void sub_02057EF8 (void * param0) { - int netId, v1; + int netId; for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) { if (!CommSys_IsPlayerConnected(netId)) { @@ -603,14 +600,14 @@ static void sub_02057FF0 (BOOL param0) void sub_02058018 (int netId, int param1, void * param2, void * param3) { - u8 * v0 = (u8 *)param2; + u8 * buffer = (u8 *)param2; if (sCommPlayerManager) { GF_ASSERT(param1 == 1); GF_ASSERT(netId < MAX_CONNECTED_PLAYERS); - GF_ASSERT((v0[0] == 1) || (v0[0] == 0)); + GF_ASSERT((buffer[0] == 1) || (buffer[0] == 0)); - sub_02059058(netId, v0[0]); + sub_02059058(netId, buffer[0]); } } @@ -663,13 +660,13 @@ static int CommPlayer_Direction (u16 unused, u16 keys) BOOL CommPlayer_CheckNPCCollision (int x, int z) { - int v0, i; + int npcCnt, i; const UnkStruct_020619DC * npcList; - v0 = sub_0203A4B4(sCommPlayerManager->fieldSys); + npcCnt = sub_0203A4B4(sCommPlayerManager->fieldSys); npcList = sub_0203A4BC(sCommPlayerManager->fieldSys); - for (i = 0; i < v0; i++) { + for (i = 0; i < npcCnt; i++) { if ((npcList[i].unk_1A == x) && (npcList[i].unk_1C == z)) { return 1; } @@ -709,8 +706,6 @@ static BOOL CommPlayer_CheckCollision (int x, int z, int netIdTarget) static int sub_020581CC (int param0, int param1) { - int v0; - if (param0 < 5) { return 8; } else if (param0 < 10) { @@ -730,8 +725,7 @@ static int sub_020581E0 (int param0) static void CommPlayer_Move (SysTask * param0, void * param1) { - u16 v0; - u8 v1; + u16 keys; int dir, v3, v4, v5, v6; CommPlayerLocation * playerLocation; UnkStruct_ov23_02249978 * v8 = NULL; @@ -775,9 +769,9 @@ static void CommPlayer_Move (SysTask * param0, void * param1) } if (!sCommPlayerManager->unk_F2[v5]) { - v0 = sub_02035E84(v5); + keys = sub_02035E84(v5); } else { - v0 = 0; + keys = 0; } playerLocation->moveSpeed = sub_02035E70(v5); @@ -808,7 +802,7 @@ static void CommPlayer_Move (SysTask * param0, void * param1) continue; } - dir = CommPlayer_Direction(v0, v0); + dir = CommPlayer_Direction(keys, keys); v3 = CommPlayer_AddXServer(v5); v4 = sub_02058F18(v5); @@ -854,7 +848,7 @@ static void CommPlayer_Move (SysTask * param0, void * param1) void CommPlayer_RecvLocation (int param0, int param1, void * src, void * param3) { - u8 * v0 = (u8 *)src; + u8 * buffer = (u8 *)src; CommPlayerLocation * playerLocation; if (sCommPlayerManager == NULL) { @@ -863,7 +857,7 @@ void CommPlayer_RecvLocation (int param0, int param1, void * src, void * param3) playerLocation = &sCommPlayerManager->playerLocationServer[param0]; - if (v0[4] & 0x80) { + if (buffer[4] & 0x80) { sCommPlayerManager->unk_2BB = 1; return; } @@ -878,11 +872,11 @@ void CommPlayer_RecvLocation (int param0, int param1, void * src, void * param3) playerLocation->x = 0; playerLocation->z = 0; - playerLocation->x += ((u32)v0[0]) & 0xff; - playerLocation->x += ((u32)v0[1] << 8) & 0xff00; - playerLocation->z += ((u32)v0[2]) & 0xff; - playerLocation->z += ((u32)v0[3] << 8) & 0xff00; - playerLocation->dir = v0[4] & 0xf; + playerLocation->x += ((u32)buffer[0]) & 0xff; + playerLocation->x += ((u32)buffer[1] << 8) & 0xff00; + playerLocation->z += ((u32)buffer[2]) & 0xff; + playerLocation->z += ((u32)buffer[3] << 8) & 0xff00; + playerLocation->dir = buffer[4] & 0xf; sCommPlayerManager->isActive[param0] = 1; sCommPlayerManager->unk_132[param0] = 1; @@ -894,27 +888,27 @@ void CommPlayer_RecvLocation (int param0, int param1, void * src, void * param3) void CommPlayer_RecvDelete (int param0, int param1, void * param2, void * param3) { - u8 * v0 = (u8 *)param2; - u8 v1 = v0[0]; + u8 * buffer = (u8 *)param2; + u8 netId = buffer[0]; if (sCommPlayerManager == NULL) { return; } - if (v1 == CommSys_CurNetId()) { + if (netId == CommSys_CurNetId()) { return; } if (sCommPlayerManager->isUnderground) { - ov23_022430B8(v1); + ov23_022430B8(netId); if (!sCommPlayerManager->isResetting) { - ov5_021F5634(sCommPlayerManager->fieldSys, sCommPlayerManager->playerLocation[v1].x, 0, sCommPlayerManager->playerLocation[v1].z); + ov5_021F5634(sCommPlayerManager->fieldSys, sCommPlayerManager->playerLocation[netId].x, 0, sCommPlayerManager->playerLocation[netId].z); } } - CommPlayer_Destroy(v1, 0, 0); - CommInfo_InitPlayer(v1); + CommPlayer_Destroy(netId, 0, 0); + CommInfo_InitPlayer(netId); } int sub_020585A4 (void) @@ -922,14 +916,13 @@ int sub_020585A4 (void) return 5; } -void sub_020585A8 (int param0, int param1, void * param2, void * param3) +void sub_020585A8 (int param0, int param1, void * src, void * param3) { - u16 v0; - u8 * v1 = (u8 *)param2; + u8 * buffer = (u8 *)src; CommPlayerLocation * playerLocation; int v3; - v3 = v1[0] & 0xf; + v3 = buffer[0] & 0xf; if (sCommPlayerManager == NULL) { return; @@ -941,7 +934,7 @@ void sub_020585A8 (int param0, int param1, void * param2, void * param3) playerLocation = &sCommPlayerManager->playerLocation[v3]; - if (v1[2] & 0x80) { + if (buffer[2] & 0x80) { playerLocation->unk_07 = 1; } else { playerLocation->unk_07 = 0; @@ -949,26 +942,26 @@ void sub_020585A8 (int param0, int param1, void * param2, void * param3) playerLocation->x = 0; playerLocation->z = 0; - playerLocation->x += ((u32)v1[1]) & 0xff; - playerLocation->x += ((u32)v1[2] << 8) & 0x100; - playerLocation->z += ((u32)v1[3]) & 0xff; - playerLocation->z += ((u32)v1[2] << 7) & 0x100; - playerLocation->dir = ((v1[0] >> 4) & 0x3); - playerLocation->moveSpeed = ((v1[0] >> 6) & 0x3); + playerLocation->x += ((u32)buffer[1]) & 0xff; + playerLocation->x += ((u32)buffer[2] << 8) & 0x100; + playerLocation->z += ((u32)buffer[3]) & 0xff; + playerLocation->z += ((u32)buffer[2] << 7) & 0x100; + playerLocation->dir = ((buffer[0] >> 4) & 0x3); + playerLocation->moveSpeed = ((buffer[0] >> 6) & 0x3); CommPlayer_Add(v3); } static void sub_02058644 (int param0) { - UnkStruct_020298B0 * v0 = sub_020298B0(sub_0203D174(sCommPlayerManager->fieldSys)); - UnkStruct_0202855C * v1 = sub_020298A0(sub_0203D174(sCommPlayerManager->fieldSys)); + UndergroundData * underground = sub_020298B0(FieldSystem_SaveData(sCommPlayerManager->fieldSys)); + SaveData_SecretBaseRecord(FieldSystem_SaveData(sCommPlayerManager->fieldSys)); if (sCommPlayerManager->isUnderground) { if (param0 == CommSys_CurNetId()) { - sub_0202929C(v0); + sub_0202929C(underground); - if (sub_020292B4(v0) == 50) { + if (sub_020292B4(underground) == 50) { sub_0202CFEC(sub_0202CD88(sCommPlayerManager->fieldSys->unk_0C), 37); } } @@ -977,8 +970,7 @@ static void sub_02058644 (int param0) static BOOL sub_020586A8 (int param0, int param1, int param2, int param3) { - LocalMapObject * v0; - int v1; + LocalMapObject * obj; u8 v3[] = { 0x14, 0x15, 0x16, 0x17, 0x10, 0x11, 0x12, 0x13, 0xc, 0xd, 0xe, 0xf }; @@ -991,30 +983,30 @@ static BOOL sub_020586A8 (int param0, int param1, int param2, int param3) return 1; } - v0 = Player_LocalMapObject(sCommPlayerManager->playerAvatar[param0]); + obj = Player_LocalMapObject(sCommPlayerManager->playerAvatar[param0]); if (Player_Dir(sCommPlayerManager->playerAvatar[param0]) != CommPlayer_GetOppositeDir(sCommPlayerManager->unk_102[param0])) { - sub_020628C4(v0, (1 << 7)); + sub_020628C4(obj, (1 << 7)); Player_SetDir(sCommPlayerManager->playerAvatar[param0], CommPlayer_GetOppositeDir(sCommPlayerManager->unk_102[param0])); - sub_020628BC(v0, (1 << 7)); + sub_020628BC(obj, (1 << 7)); } - if (sub_02065684(v0) == 1) { + if (sub_02065684(obj) == 1) { (void)0; } - if (sub_020655F4(v0) == 1) { + if (sub_020655F4(obj) == 1) { sub_02058644(param0); switch (param3) { case 0: - sub_02065638(v0, v3[sCommPlayerManager->unk_102[param0]]); + sub_02065638(obj, v3[sCommPlayerManager->unk_102[param0]]); break; case 1: - sub_02065638(v0, v3[sCommPlayerManager->unk_102[param0] + 4]); + sub_02065638(obj, v3[sCommPlayerManager->unk_102[param0] + 4]); break; case 2: - sub_02065638(v0, v3[sCommPlayerManager->unk_102[param0] + 8]); + sub_02065638(obj, v3[sCommPlayerManager->unk_102[param0] + 8]); break; } } else { @@ -1163,7 +1155,7 @@ static void CommPlayer_MoveClient (int netId) static BOOL sub_02058A18 (int param0, int param1) { - int v0, v1; + int x, z; CommPlayerLocation * playerLocation; if (sCommPlayerManager->unk_10A[param0] == 0) { @@ -1180,13 +1172,13 @@ static BOOL sub_02058A18 (int param0, int param1) return 1; } - v0 = sub_02058DF8(param0); - v1 = sub_02058E4C(param0); - v0 += sub_0206419C(sCommPlayerManager->unk_112[param0]); - v1 += sub_020641A8(sCommPlayerManager->unk_112[param0]); + x = sub_02058DF8(param0); + z = sub_02058E4C(param0); + x += sub_0206419C(sCommPlayerManager->unk_112[param0]); + z += sub_020641A8(sCommPlayerManager->unk_112[param0]); if (sCommPlayerManager->unk_10A[param0] != 0) { - if (CommPlayer_CheckCollision(v0, v1, param0)) { + if (CommPlayer_CheckCollision(x, z, param0)) { sCommPlayerManager->unk_10A[param0] = 1; } } @@ -1201,8 +1193,8 @@ static BOOL sub_02058A18 (int param0, int param1) } playerLocation = &sCommPlayerManager->playerLocationServer[param0]; - playerLocation->x = v0; - playerLocation->z = v1; + playerLocation->x = x; + playerLocation->z = z; switch (param1) { case 2: @@ -1222,7 +1214,6 @@ static BOOL sub_02058A18 (int param0, int param1) void sub_02058B0C (int param0, int param1, BOOL param2) { CommPlayerLocation * playerLocation = &sCommPlayerManager->playerLocationServer[param0]; - u8 v1[3]; playerLocation->dir = CommPlayer_GetOppositeDir(param1); sCommPlayerManager->unk_112[param0] = param1; @@ -1250,16 +1241,16 @@ void sub_02058B94 (int param0) void sub_02058BA8 (int param0, int param1, BOOL param2) { - LocalMapObject * v0; + LocalMapObject * obj; if (sCommPlayerManager->playerAvatar[param0] == NULL) { return; } - v0 = Player_LocalMapObject(sCommPlayerManager->playerAvatar[param0]); + obj = Player_LocalMapObject(sCommPlayerManager->playerAvatar[param0]); - sub_020628BC(v0, (1 << 7)); - sub_020628BC(v0, (1 << 8)); + sub_020628BC(obj, (1 << 7)); + sub_020628BC(obj, (1 << 8)); sCommPlayerManager->unk_102[param0] = param1; } @@ -1519,11 +1510,11 @@ BOOL sub_02059094 (int netId) BOOL sub_020590C4 (void) { - UnkStruct_020590C4 v0[] = { + UnkStruct_020590C4 batleGrid1v1[] = { {4, 7}, {11, 7} }; - UnkStruct_020590C4 v1[] = { + UnkStruct_020590C4 battleGrid2v2[] = { {4, 6}, {11, 6}, {4, 8}, @@ -1535,9 +1526,9 @@ BOOL sub_020590C4 (void) UnkStruct_020590C4 * v9; if (connectedPlayers == 2) { - v9 = v0; + v9 = batleGrid1v1; } else { - v9 = v1; + v9 = battleGrid2v2; } for (netId = 0; netId < connectedPlayers; netId++) { @@ -1588,25 +1579,25 @@ static UnkStruct_020590C4 Unk_02100B74[] = { static void sub_020591A8 (void) { - int v0 = sub_02036148(sub_0203895C()); - int v1, v3 = 0, v4[4]; + int connectedPlayers = sub_02036148(sub_0203895C()); + int netJd, v3 = 0, v4[4]; int v5 = 0; UnkStruct_020590C4 * v6; u8 netId; - if (v0 == 2) { + if (connectedPlayers == 2) { v6 = Unk_02100B6C; } else { v6 = Unk_02100B74; } - for (netId = 0; netId < v0; netId++) { + for (netId = 0; netId < connectedPlayers; netId++) { if (!sCommPlayerManager->unk_2B4[netId]) { continue; } - for (v1 = 0; v1 < v0; v1++) { - if ((sub_02058DF8(netId) == v6[v1].unk_00) && (sub_02058E4C(netId) == v6[v1].unk_02)) { + for (netJd = 0; netJd < connectedPlayers; netJd++) { + if ((sub_02058DF8(netId) == v6[netJd].unk_00) && (sub_02058E4C(netId) == v6[netJd].unk_02)) { sCommPlayerManager->unk_F2[netId] = 1; sub_02035B48(95, &netId); } @@ -1617,33 +1608,33 @@ static void sub_020591A8 (void) void CommPlayer_SetBattleDir (void) { int netId = CommSys_CurNetId(); - int v1; + int code; if (CommPlayer_XPos(netId) > 8) { CommPlayer_SetDir(2); - v1 = sub_02065838(2, 0x24); + code = sub_02065838(2, 0x24); } else { CommPlayer_SetDir(3); - v1 = sub_02065838(3, 0x24); + code = sub_02065838(3, 0x24); } - sub_02061550(sCommPlayerManager->playerAvatar[netId], v1, 1); + sub_02061550(sCommPlayerManager->playerAvatar[netId], code, 1); CommPlayerManager_ForceDir(); } BOOL sub_0205928C (void) { - int v0 = sub_02036148(sub_0203895C()); + int connectedPlayers = sub_02036148(sub_0203895C()); int netId, v3 = 0, v4[4], v5; int v6 = 0; - for (netId = 0; netId < v0; netId++) { + for (netId = 0; netId < connectedPlayers; netId++) { if ((sCommPlayerManager->isActive[netId] == 0) || (sCommPlayerManager->unk_132[netId] == 1)) { return 0; } } - for (netId = 0; netId < v0; netId++) { + for (netId = 0; netId < connectedPlayers; netId++) { CommPlayerLocation * playerLocation = &sCommPlayerManager->playerLocationServer[netId]; v5 = CommPlayer_GetOppositeDir(playerLocation->dir); @@ -1745,8 +1736,8 @@ void sub_0205948C (int param0) } if (sCommPlayerManager->unk_00 == 0x10) { - u8 v0 = 1; - sub_020360D0(62, &v0); + u8 data = 1; + sub_020360D0(62, &data); } if (sCommPlayerManager->unk_00 == 0) { diff --git a/src/unk_0205B33C.c b/src/unk_0205B33C.c index 4c4be659fd..d8b4ec09df 100644 --- a/src/unk_0205B33C.c +++ b/src/unk_0205B33C.c @@ -152,7 +152,7 @@ static UnkStruct_0205B43C * sub_0205B3A0 (FieldSystem * param0) return NULL; } - v1 = sub_0203D174(param0); + v1 = FieldSystem_SaveData(param0); sub_020369EC(v1); v2 = (UnkStruct_0205B43C *)Heap_AllocFromHeap(31, sizeof(UnkStruct_0205B43C)); diff --git a/src/unk_0205E7D0.c b/src/unk_0205E7D0.c index 084f278464..082c04d161 100644 --- a/src/unk_0205E7D0.c +++ b/src/unk_0205E7D0.c @@ -270,7 +270,7 @@ void sub_0205EB10 (PlayerAvatar * param0, int param1) param0->unk_18 = param1; } -int sub_0205EB14 (const PlayerAvatar * param0) +int Player_MoveState (const PlayerAvatar * param0) { return param0->unk_18; } diff --git a/src/unk_0205F180.c b/src/unk_0205F180.c index efce12ba5b..9b2a6d0236 100644 --- a/src/unk_0205F180.c +++ b/src/unk_0205F180.c @@ -313,7 +313,7 @@ void sub_0205F490 (PlayerAvatar * param0) const LocalMapObject * v3; v0 = sub_0205EB0C(param0); - v1 = sub_0205EB14(param0); + v1 = Player_MoveState(param0); v3 = Player_LocalMapObject(param0); sub_0205EB10(param0, 0); @@ -397,7 +397,7 @@ int sub_0205F588 (PlayerAvatar * param0) const LocalMapObject * v3; v0 = sub_0205EB0C(param0); - v1 = sub_0205EB14(param0); + v1 = Player_MoveState(param0); if (v0 == 0) { return 1; diff --git a/src/unk_02068344.c b/src/unk_02068344.c index f16928f3c8..381e47b4f1 100644 --- a/src/unk_02068344.c +++ b/src/unk_02068344.c @@ -66,7 +66,7 @@ void sub_02068344 (FieldSystem * param0) int v0; UnkStruct_02027860 * v1; - v1 = sub_02027860(sub_0203D174(param0)); + v1 = sub_02027860(FieldSystem_SaveData(param0)); v0 = sub_02027F80(v1); if (v0 == 0) { @@ -81,7 +81,7 @@ void sub_02068368 (FieldSystem * param0) int v0; UnkStruct_02027860 * v1; - v1 = sub_02027860(sub_0203D174(param0)); + v1 = sub_02027860(FieldSystem_SaveData(param0)); v0 = sub_02027F80(v1); if (v0 == 0) { @@ -98,7 +98,7 @@ BOOL sub_02068390 (FieldSystem * param0, const int param1, const int param2, con int v0; UnkStruct_02027860 * v1; - v1 = sub_02027860(sub_0203D174(param0)); + v1 = sub_02027860(FieldSystem_SaveData(param0)); v0 = sub_02027F80(v1); if (v0 == 0) { diff --git a/src/unk_0206B70C.c b/src/unk_0206B70C.c index 43517c570b..d96b9e22c3 100644 --- a/src/unk_0206B70C.c +++ b/src/unk_0206B70C.c @@ -114,7 +114,7 @@ void sub_0206B70C (FieldSystem * param0, UnkStruct_0203D8AC * param1, int param2 param1->unk_04 = v10->unk_0C; } - v0 = SaveData_GetTrainerInfo(sub_0203D174(param0)); + v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0)); param1->unk_0C = TrainerInfo_Gender(v0); v7 = sub_0203A76C(sub_0203A790(param0->unk_0C)); v2 = (v7->unk_00 - 2 + 6) % 6; diff --git a/src/unk_0206B9D8.c b/src/unk_0206B9D8.c index 6b776075a2..a1e160aef3 100644 --- a/src/unk_0206B9D8.c +++ b/src/unk_0206B9D8.c @@ -329,7 +329,7 @@ u16 sub_0206BDBC (SaveData * param0) { UnkStruct_0203068C * v0; UnkStruct_0202D750 * v1; - UnkStruct_020298B0 * v2; + UndergroundData * v2; u16 v3; u8 v4, v5, v6, v7, v8, v9; diff --git a/src/unk_0206CCB0.c b/src/unk_0206CCB0.c index 10c69f49e4..c4777219cc 100644 --- a/src/unk_0206CCB0.c +++ b/src/unk_0206CCB0.c @@ -2172,7 +2172,7 @@ static BOOL sub_0206EA0C (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1) static int sub_0206EA10 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(sub_0203D174(param0)); + TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0)); int v1 = param0->unk_1C->unk_00; if ((v1 == 411) || ((v1 >= 412) && (v1 <= 417))) { @@ -2629,7 +2629,7 @@ static int sub_0206EDAC (FieldSystem * param0, StringFormatter * param1, UnkStru u16 v2, v3; u32 v4, v5; Strbuf* v6 = Strbuf_Init(22, 4); - TrainerInfo * v7 = SaveData_GetTrainerInfo(sub_0203D174(param0)); + TrainerInfo * v7 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0)); v1 = sub_0202D834(param0->unk_0C); v2 = (LCRNG_Next() % 29); diff --git a/src/unk_0207160C.c b/src/unk_0207160C.c index e44c65cebe..ba91de4d7c 100644 --- a/src/unk_0207160C.c +++ b/src/unk_0207160C.c @@ -123,7 +123,7 @@ void sub_0207160C (FieldSystem * param0) const UnkStruct_020F03F4 * v4; fx32 v5; - v2 = sub_02027860(sub_0203D174(param0)); + v2 = sub_02027860(FieldSystem_SaveData(param0)); v3 = (UnkStruct_020716D4 *)sub_02027F6C(v2, 7); v4 = &Unk_020F03F4[v3->unk_02]; v5 = v4->unk_00[v3->unk_00]; @@ -162,7 +162,7 @@ void sub_020716D4 (FieldSystem * param0) UnkStruct_02027860 * v0; UnkStruct_020716D4 * v1; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); sub_02027F5C(v0, 7); v1 = (UnkStruct_020716D4 *)sub_02027F6C(v0, 7); @@ -274,7 +274,7 @@ u8 sub_02071818 (FieldSystem * param0) UnkStruct_02027860 * v0; UnkStruct_020716D4 * v1; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); v1 = (UnkStruct_020716D4 *)sub_02027F6C(v0, 7); if (v1->unk_04) { @@ -290,7 +290,7 @@ void sub_0207183C (FieldSystem * param0) UnkStruct_020716D4 * v1; UnkStruct_020718D8 * v2; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); v1 = (UnkStruct_020716D4 *)sub_02027F6C(v0, 7); if ((Unk_020F03F4[v1->unk_02].unk_10) && (v1->unk_00 == 1)) { diff --git a/src/unk_02071B10.c b/src/unk_02071B10.c index dc62fef696..fed7e2de8a 100644 --- a/src/unk_02071B10.c +++ b/src/unk_02071B10.c @@ -53,7 +53,7 @@ void sub_02071B10 (FieldSystem * param0) UnkStruct_02027860 * v0; UnkStruct_02071B10 * v1; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); sub_02027F5C(v0, 1); v1 = (UnkStruct_02071B10 *)sub_02027F6C(v0, 1); @@ -65,7 +65,7 @@ void sub_02071B30 (FieldSystem * param0) UnkStruct_02027860 * v0; UnkStruct_02071B30 * v1; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); sub_02027F5C(v0, 3); v1 = (UnkStruct_02071B30 *)sub_02027F6C(v0, 3); @@ -87,7 +87,7 @@ void sub_02071B6C (FieldSystem * param0, const u8 param1) GF_ASSERT(param1 < 3); - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); sub_02027F5C(v0, 5); v1 = (UnkStruct_02071B6C *)sub_02027F6C(v0, 5); @@ -120,7 +120,7 @@ void sub_02071BD0 (FieldSystem * param0) UnkStruct_02027860 * v0; UnkStruct_02071BD0 * v1; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); sub_02027F5C(v0, 8); v1 = sub_02027F6C(v0, 8); @@ -132,7 +132,7 @@ void sub_02071BF8 (FieldSystem * param0) UnkStruct_02027860 * v0; UnkStruct_02071BF8 * v1; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); sub_02027F5C(v0, 4); v1 = (UnkStruct_02071BF8 *)sub_02027F6C(v0, 4); @@ -144,7 +144,7 @@ void sub_02071C18 (FieldSystem * param0) UnkStruct_02027860 * v0; UnkStruct_02071C18 * v1; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); sub_02027F5C(v0, 2); v1 = (UnkStruct_02071C18 *)sub_02027F6C(v0, 2); } @@ -154,7 +154,7 @@ void sub_02071C34 (FieldSystem * param0) UnkStruct_02027860 * v0; UnkStruct_02071C34 * v1; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); sub_02027F5C(v0, 10); v1 = sub_02027F6C(v0, 10); @@ -166,7 +166,7 @@ void sub_02071C5C (FieldSystem * param0) UnkStruct_02027860 * v0; UnkStruct_02071C5C * v1; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); sub_02027F5C(v0, 9); v1 = sub_02027F6C(v0, 9); @@ -190,7 +190,7 @@ BOOL sub_02071CB4 (FieldSystem * param0, int param1) { UnkStruct_02027860 * v0; - v0 = sub_02027860(sub_0203D174(param0)); + v0 = sub_02027860(FieldSystem_SaveData(param0)); if (param1 == sub_02027F80(v0)) { return 1; diff --git a/src/unk_02071CD0.c b/src/unk_02071CD0.c index ec5d08bcf1..23961e6a80 100644 --- a/src/unk_02071CD0.c +++ b/src/unk_02071CD0.c @@ -18,7 +18,7 @@ void sub_02071CD0 (FieldSystem * param0) UnkStruct_02027860 * v1; UnkStruct_ov6_02242AF0 * v2; - v1 = sub_02027860(sub_0203D174(param0)); + v1 = sub_02027860(FieldSystem_SaveData(param0)); v0 = sub_02027F80(v1); if (v0 != 6) { diff --git a/src/unk_02071D40.c b/src/unk_02071D40.c index 6271d219a5..46322b9fd6 100644 --- a/src/unk_02071D40.c +++ b/src/unk_02071D40.c @@ -52,7 +52,7 @@ void sub_02071D40 (const u8 param0, const u8 param1, const u8 param2, const u8 p UnkStruct_0202CD88 * v1; SaveData * v2; - v2 = sub_0203D174(param4); + v2 = FieldSystem_SaveData(param4); v0 = SaveData_GetTrainerInfo(v2); v1 = sub_0202CD88(v2); @@ -128,13 +128,13 @@ u8 sub_02071F28 (FieldSystem * param0) SaveData * v1; UnkStruct_0202CD88 * v2; UnkStruct_020507E4 * v3; - UnkStruct_0202855C * v4; + SecretBaseRecord * v4; UnkStruct_0203068C * v5; - v1 = sub_0203D174(param0); + v1 = FieldSystem_SaveData(param0); v2 = sub_0202CD88(v1); v3 = SaveData_Events(v1); - v4 = sub_020298A0(v1); + v4 = SaveData_SecretBaseRecord(v1); v5 = sub_0203068C(v1); v0 = 0; diff --git a/src/unk_020722AC.c b/src/unk_020722AC.c index 317e0a58b5..829a86b204 100644 --- a/src/unk_020722AC.c +++ b/src/unk_020722AC.c @@ -218,7 +218,7 @@ void sub_020722AC (void * param0, int * param1) MI_CpuClear8(v0, sizeof(UnkStruct_02072334)); v0->unk_04 = param1; - v1 = sub_0203D174(param0); + v1 = FieldSystem_SaveData(param0); v0->unk_16C = (FieldSystem *)param0; v0->unk_00 = 43; @@ -1012,7 +1012,7 @@ static void sub_020730B8 (UnkStruct_02072334 * param0, u8 param1, BOOL param2) return; } - v1 = Party_GetFromSavedata(sub_0203D174(param0->unk_16C)); + v1 = Party_GetFromSavedata(FieldSystem_SaveData(param0->unk_16C)); v2 = Party_GetPokemonBySlotIndex(v1, param1); sub_020977E4(param0->unk_1AC, param0->unk_18, v2, param0->unk_00); @@ -1225,9 +1225,9 @@ static int sub_02073524 (UnkStruct_02072334 * param0, int param1) v0 = Heap_AllocFromHeap(param0->unk_00, sizeof(PartyManagementData)); MI_CpuClear8(v0, sizeof(PartyManagementData)); - v0->unk_00 = Party_GetFromSavedata(sub_0203D174(param0->unk_16C)); - v0->unk_04 = sub_0207D990(sub_0203D174(param0->unk_16C)); - v0->unk_0C = sub_02025E44(sub_0203D174(param0->unk_16C)); + v0->unk_00 = Party_GetFromSavedata(FieldSystem_SaveData(param0->unk_16C)); + v0->unk_04 = sub_0207D990(FieldSystem_SaveData(param0->unk_16C)); + v0->unk_0C = sub_02025E44(FieldSystem_SaveData(param0->unk_16C)); v0->unk_08 = sub_02028430(param0->unk_16C->unk_0C); v0->unk_21 = 0; v0->unk_20 = param1; diff --git a/src/unk_02098218.c b/src/unk_02098218.c index 47e2f30f40..1c0fa47ed4 100644 --- a/src/unk_02098218.c +++ b/src/unk_02098218.c @@ -218,7 +218,7 @@ static BOOL sub_0209843C (UnkStruct_020508D4 * param0) { Pokemon * v2 = v0->unk_0C.unk_00; - TrainerInfo * v3 = SaveData_GetTrainerInfo(sub_0203D174(v1)); + TrainerInfo * v3 = SaveData_GetTrainerInfo(FieldSystem_SaveData(v1)); int v4 = 6; int v5 = MapHeader_GetMapLabelTextID(v1->unk_1C->unk_00); int v6 = 11; @@ -230,7 +230,7 @@ static BOOL sub_0209843C (UnkStruct_020508D4 * param0) } { - sub_0202F180(sub_0203D174(v1), v0->unk_0C.unk_00); + sub_0202F180(FieldSystem_SaveData(v1), v0->unk_0C.unk_00); } if (v0->unk_04 == 1) { @@ -247,7 +247,7 @@ static BOOL sub_0209843C (UnkStruct_020508D4 * param0) v9 = Pokemon_GetValue(v0->unk_0C.unk_00, MON_DATA_SPECIES, 0); - v0->unk_08 = sub_0208712C(11, 1, v9, 10, sub_02025E44(sub_0203D174(v8))); + v0->unk_08 = sub_0208712C(11, 1, v9, 10, sub_02025E44(FieldSystem_SaveData(v8))); v0->unk_08->unk_10 = Pokemon_GetValue(v0->unk_0C.unk_00, MON_DATA_GENDER, NULL); v0->unk_08->unk_08 = Pokemon_GetValue(v0->unk_0C.unk_00, MON_DATA_FORM, NULL); sub_02050A38(param0, &Unk_020F2DAC, v0->unk_08); @@ -260,7 +260,7 @@ static BOOL sub_0209843C (UnkStruct_020508D4 * param0) { FieldSystem * v10 = sub_02050A60(param0); - UnkStruct_0202CD88 * v11 = sub_0202CD88(sub_0203D174(v10)); + UnkStruct_0202CD88 * v11 = sub_0202CD88(FieldSystem_SaveData(v10)); sub_0202CF28(v11, (1 + 48)); } diff --git a/src/unk_02099604.c b/src/unk_02099604.c index b0e3bfc524..fce12dd5bd 100644 --- a/src/unk_02099604.c +++ b/src/unk_02099604.c @@ -60,7 +60,7 @@ UnkStruct_ov82_0223B164 * sub_02099674 (FieldSystem * param0, int param1, int pa { UnkStruct_ov82_0223B164 * v0; - v0 = sub_02099604(param1, sub_0203D174(param0), param2, param0->unk_9C); + v0 = sub_02099604(param1, FieldSystem_SaveData(param0), param2, param0->unk_9C); sub_0209964C(param0, v0); return v0; @@ -70,7 +70,7 @@ UnkStruct_ov82_0223B164 * sub_020996A0 (FieldSystem * param0, int param1, BOOL p { UnkStruct_ov82_0223B164 * v0; - v0 = sub_02099604(1, sub_0203D174(param0), param1, param0->unk_9C); + v0 = sub_02099604(1, FieldSystem_SaveData(param0), param1, param0->unk_9C); v0->unk_20 = 1; v0->unk_24 = param2;