From f8ce642c125d1bd2e4ffb5bbbe37c2345d69eb73 Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Fri, 17 May 2024 13:11:34 -0400 Subject: [PATCH] LocalMapObj -> MapObk --- include/constdata/const_020EE4B8.h | 2 +- include/functypes/funcptr_020EDF0C.h | 2 +- include/functypes/funcptr_020EDF0C_1.h | 2 +- include/functypes/funcptr_020EDF0C_2.h | 2 +- include/functypes/funcptr_020EDF0C_3.h | 2 +- include/overlay005/funcptr_ov5_021FB0F0.h | 2 +- include/overlay005/funcptr_ov5_021FB0F0_1.h | 2 +- include/overlay005/funcptr_ov5_021FB0F0_2.h | 2 +- include/overlay005/funcptr_ov5_021FB0F0_3.h | 2 +- include/overlay005/funcptr_ov5_021FB0F0_4.h | 2 +- include/overlay005/ov5_021DB888.h | 4 +- include/overlay005/ov5_021DF440.h | 2 +- include/overlay005/ov5_021EB1A0.h | 90 +-- include/overlay005/ov5_021ECA70.h | 18 +- include/overlay005/ov5_021ECC20.h | 20 +- include/overlay005/ov5_021ECE40.h | 26 +- include/overlay005/ov5_021F10E8.h | 2 +- include/overlay005/ov5_021F134C.h | 4 +- include/overlay005/ov5_021F17B8.h | 2 +- include/overlay005/ov5_021F1CC8.h | 12 +- include/overlay005/ov5_021F204C.h | 4 +- include/overlay005/ov5_021F23D0.h | 2 +- include/overlay005/ov5_021F25C0.h | 2 +- include/overlay005/ov5_021F2850.h | 2 +- include/overlay005/ov5_021F2A7C.h | 2 +- include/overlay005/ov5_021F2BD0.h | 2 +- include/overlay005/ov5_021F2D20.h | 2 +- include/overlay005/ov5_021F3284.h | 2 +- include/overlay005/ov5_021F348C.h | 4 +- include/overlay005/ov5_021F37A8.h | 2 +- include/overlay005/ov5_021F3A50.h | 2 +- include/overlay005/ov5_021F3D00.h | 2 +- include/overlay005/ov5_021F3E74.h | 2 +- include/overlay005/ov5_021F47B0.h | 2 +- include/overlay005/ov5_021F50BC.h | 2 +- include/overlay005/ov5_021F5284.h | 2 +- include/overlay005/ov5_021F5428.h | 2 +- include/overlay005/ov5_021F5894.h | 2 +- include/overlay005/ov5_021F5A10.h | 2 +- include/overlay005/ov5_021F600C.h | 2 +- include/overlay005/struct_ov5_021EE294.h | 2 +- include/overlay009/ov9_02249960.h | 8 +- include/struct_decls/struct_02061AB4_decl.h | 2 +- include/struct_defs/struct_02070950.h | 2 +- include/unk_0203C954.h | 6 +- include/unk_0203E880.h | 8 +- include/unk_02055C50.h | 22 +- include/unk_0205DFC4.h | 4 +- include/unk_0205E7D0.h | 10 +- include/unk_0205F180.h | 4 +- include/unk_02061804.h | 372 +++++----- include/unk_02063400.h | 46 +- include/unk_0206450C.h | 112 +-- include/unk_020655F4.h | 18 +- include/unk_020673B8.h | 4 +- include/unk_020677F4.h | 22 +- include/unk_02067A84.h | 8 +- include/unk_02069BE0.h | 64 +- src/comm_player_manager.c | 40 +- src/overlay005/ov5_021D1C30.c | 14 +- src/overlay005/ov5_021D431C.c | 64 +- src/overlay005/ov5_021DB888.c | 42 +- src/overlay005/ov5_021DF440.c | 2 +- src/overlay005/ov5_021DFB54.c | 78 +- src/overlay005/ov5_021E1154.c | 12 +- src/overlay005/ov5_021E135C.c | 4 +- src/overlay005/ov5_021EB1A0.c | 230 +++--- src/overlay005/ov5_021ECA70.c | 38 +- src/overlay005/ov5_021ECC20.c | 22 +- src/overlay005/ov5_021ECE40.c | 78 +- src/overlay005/ov5_021F08CC.c | 42 +- src/overlay005/ov5_021F10E8.c | 6 +- src/overlay005/ov5_021F134C.c | 10 +- src/overlay005/ov5_021F17B8.c | 12 +- src/overlay005/ov5_021F1CC8.c | 16 +- src/overlay005/ov5_021F204C.c | 10 +- src/overlay005/ov5_021F23D0.c | 8 +- src/overlay005/ov5_021F25C0.c | 10 +- src/overlay005/ov5_021F2850.c | 6 +- src/overlay005/ov5_021F2A7C.c | 2 +- src/overlay005/ov5_021F2BD0.c | 2 +- src/overlay005/ov5_021F2D20.c | 8 +- src/overlay005/ov5_021F3284.c | 8 +- src/overlay005/ov5_021F348C.c | 12 +- src/overlay005/ov5_021F37A8.c | 8 +- src/overlay005/ov5_021F3A50.c | 8 +- src/overlay005/ov5_021F3D00.c | 8 +- src/overlay005/ov5_021F3E74.c | 8 +- src/overlay005/ov5_021F47B0.c | 16 +- src/overlay005/ov5_021F50BC.c | 8 +- src/overlay005/ov5_021F5284.c | 8 +- src/overlay005/ov5_021F5428.c | 8 +- src/overlay005/ov5_021F5894.c | 2 +- src/overlay005/ov5_021F5A10.c | 8 +- src/overlay005/ov5_021F600C.c | 8 +- src/overlay005/ov5_021F61BC.c | 10 +- src/overlay005/ov5_021F6454.c | 30 +- src/overlay005/ov5_021F8560.c | 12 +- src/overlay006/ov6_0223E140.c | 20 +- src/overlay006/ov6_02242AF0.c | 4 +- src/overlay006/ov6_02243258.c | 6 +- src/overlay006/ov6_02247100.c | 10 +- src/overlay006/ov6_02248050.c | 2 +- src/overlay008/ov8_02249960.c | 62 +- src/overlay009/ov9_02249960.c | 202 +++--- src/overlay023/ov23_02241F74.c | 2 +- src/overlay023/ov23_0224A1D0.c | 6 +- src/overlay023/ov23_0224B05C.c | 2 +- src/overlay023/ov23_022521F0.c | 2 +- src/unk_0203C954.c | 10 +- src/unk_0203E880.c | 22 +- src/unk_0203F6C4.c | 110 +-- src/unk_02048614.c | 6 +- src/unk_0204B64C.c | 16 +- src/unk_02050568.c | 2 +- src/unk_020530C8.c | 2 +- src/unk_02055C50.c | 44 +- src/unk_02056B30.c | 28 +- src/unk_0205A0D8.c | 2 +- src/unk_0205C22C.c | 24 +- src/unk_0205CA94.c | 2 +- src/unk_0205DFC4.c | 8 +- src/unk_0205E7D0.c | 178 ++--- src/unk_0205F180.c | 220 +++--- src/unk_02061804.c | 618 ++++++++-------- src/unk_02063400.c | 204 +++--- src/unk_0206450C.c | 228 +++--- src/unk_020655F4.c | 764 ++++++++++---------- src/unk_020673B8.c | 72 +- src/unk_020677F4.c | 32 +- src/unk_02067A84.c | 86 +-- src/unk_020683F4.c | 14 +- src/unk_02069BE0.c | 190 ++--- src/unk_0206C0E8.c | 2 +- src/unk_0207070C.c | 4 +- src/unk_020EDBAC.c | 310 ++++---- 136 files changed, 2696 insertions(+), 2696 deletions(-) diff --git a/include/constdata/const_020EE4B8.h b/include/constdata/const_020EE4B8.h index 7f7fd3887d..6a24e31174 100644 --- a/include/constdata/const_020EE4B8.h +++ b/include/constdata/const_020EE4B8.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_02061AB4_decl.h" -extern int(*const * const Unk_020EE4B8[0x9a])(LocalMapObject *); +extern int(*const * const Unk_020EE4B8[0x9a])(MapObject *); #endif // POKEPLATINUM_CONST_020EE4B8_H diff --git a/include/functypes/funcptr_020EDF0C.h b/include/functypes/funcptr_020EDF0C.h index 264b75b8d7..dd2eb6a460 100644 --- a/include/functypes/funcptr_020EDF0C.h +++ b/include/functypes/funcptr_020EDF0C.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_02061AB4_decl.h" -typedef void (* UnkFuncPtr_020EDF0C)(LocalMapObject *); +typedef void (* UnkFuncPtr_020EDF0C)(MapObject *); #endif // POKEPLATINUM_FUNCPTR_020EDF0C_H diff --git a/include/functypes/funcptr_020EDF0C_1.h b/include/functypes/funcptr_020EDF0C_1.h index 9992c2e4df..5d04bf1efc 100644 --- a/include/functypes/funcptr_020EDF0C_1.h +++ b/include/functypes/funcptr_020EDF0C_1.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_02061AB4_decl.h" -typedef void (* UnkFuncPtr_020EDF0C_1)(LocalMapObject *); +typedef void (* UnkFuncPtr_020EDF0C_1)(MapObject *); #endif // POKEPLATINUM_FUNCPTR_020EDF0C_1_H diff --git a/include/functypes/funcptr_020EDF0C_2.h b/include/functypes/funcptr_020EDF0C_2.h index ceb8a11a6a..b75c916c91 100644 --- a/include/functypes/funcptr_020EDF0C_2.h +++ b/include/functypes/funcptr_020EDF0C_2.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_02061AB4_decl.h" -typedef void (* UnkFuncPtr_020EDF0C_2)(LocalMapObject *); +typedef void (* UnkFuncPtr_020EDF0C_2)(MapObject *); #endif // POKEPLATINUM_FUNCPTR_020EDF0C_2_H diff --git a/include/functypes/funcptr_020EDF0C_3.h b/include/functypes/funcptr_020EDF0C_3.h index fe5bd10328..4e36f5a814 100644 --- a/include/functypes/funcptr_020EDF0C_3.h +++ b/include/functypes/funcptr_020EDF0C_3.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_02061AB4_decl.h" -typedef void (* UnkFuncPtr_020EDF0C_3)(LocalMapObject *); +typedef void (* UnkFuncPtr_020EDF0C_3)(MapObject *); #endif // POKEPLATINUM_FUNCPTR_020EDF0C_3_H diff --git a/include/overlay005/funcptr_ov5_021FB0F0.h b/include/overlay005/funcptr_ov5_021FB0F0.h index def6763d47..e632ca6dcd 100644 --- a/include/overlay005/funcptr_ov5_021FB0F0.h +++ b/include/overlay005/funcptr_ov5_021FB0F0.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_02061AB4_decl.h" -typedef void (* UnkFuncPtr_ov5_021FB0F0)(LocalMapObject *); +typedef void (* UnkFuncPtr_ov5_021FB0F0)(MapObject *); #endif // POKEPLATINUM_FUNCPTR_OV5_021FB0F0_H diff --git a/include/overlay005/funcptr_ov5_021FB0F0_1.h b/include/overlay005/funcptr_ov5_021FB0F0_1.h index 82f7ba2a28..c3aee1e0ec 100644 --- a/include/overlay005/funcptr_ov5_021FB0F0_1.h +++ b/include/overlay005/funcptr_ov5_021FB0F0_1.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_02061AB4_decl.h" -typedef void (* UnkFuncPtr_ov5_021FB0F0_1)(LocalMapObject *); +typedef void (* UnkFuncPtr_ov5_021FB0F0_1)(MapObject *); #endif // POKEPLATINUM_FUNCPTR_OV5_021FB0F0_1_H diff --git a/include/overlay005/funcptr_ov5_021FB0F0_2.h b/include/overlay005/funcptr_ov5_021FB0F0_2.h index 22c8c00bdb..0d57b66ef1 100644 --- a/include/overlay005/funcptr_ov5_021FB0F0_2.h +++ b/include/overlay005/funcptr_ov5_021FB0F0_2.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_02061AB4_decl.h" -typedef void (* UnkFuncPtr_ov5_021FB0F0_2)(LocalMapObject *); +typedef void (* UnkFuncPtr_ov5_021FB0F0_2)(MapObject *); #endif // POKEPLATINUM_FUNCPTR_OV5_021FB0F0_2_H diff --git a/include/overlay005/funcptr_ov5_021FB0F0_3.h b/include/overlay005/funcptr_ov5_021FB0F0_3.h index 656a4e46b6..bd8e10ac17 100644 --- a/include/overlay005/funcptr_ov5_021FB0F0_3.h +++ b/include/overlay005/funcptr_ov5_021FB0F0_3.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_02061AB4_decl.h" -typedef void (* UnkFuncPtr_ov5_021FB0F0_3)(LocalMapObject *); +typedef void (* UnkFuncPtr_ov5_021FB0F0_3)(MapObject *); #endif // POKEPLATINUM_FUNCPTR_OV5_021FB0F0_3_H diff --git a/include/overlay005/funcptr_ov5_021FB0F0_4.h b/include/overlay005/funcptr_ov5_021FB0F0_4.h index 503b5ab5cf..976e0d7e4d 100644 --- a/include/overlay005/funcptr_ov5_021FB0F0_4.h +++ b/include/overlay005/funcptr_ov5_021FB0F0_4.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_02061AB4_decl.h" -typedef void (* UnkFuncPtr_ov5_021FB0F0_4)(LocalMapObject *); +typedef void (* UnkFuncPtr_ov5_021FB0F0_4)(MapObject *); #endif // POKEPLATINUM_FUNCPTR_OV5_021FB0F0_4_H diff --git a/include/overlay005/ov5_021DB888.h b/include/overlay005/ov5_021DB888.h index dfb3433094..bd15c9af74 100644 --- a/include/overlay005/ov5_021DB888.h +++ b/include/overlay005/ov5_021DB888.h @@ -7,7 +7,7 @@ void ov5_021DB888(TaskManager * param0, StringTemplate * param1, u16 * param2); BOOL ov5_021DBB94(FieldSystem * param0); -u16 ov5_021DBD98(FieldSystem * param0, LocalMapObject * param1, u16 param2); -void ov5_021DBED4(FieldSystem * param0, LocalMapObject * param1); +u16 ov5_021DBD98(FieldSystem * param0, MapObject * param1, u16 param2); +void ov5_021DBED4(FieldSystem * param0, MapObject * param1); #endif // POKEPLATINUM_OV5_021DB888_H diff --git a/include/overlay005/ov5_021DF440.h b/include/overlay005/ov5_021DF440.h index 07e3ec7b06..6a76dde828 100644 --- a/include/overlay005/ov5_021DF440.h +++ b/include/overlay005/ov5_021DF440.h @@ -27,7 +27,7 @@ void * ov5_021DF53C(const UnkStruct_ov5_021DF47C * param0, u32 param1, int param void ov5_021DF554(void * param0); void * ov5_021DF55C(UnkStruct_ov5_021DF47C * param0, u32 param1); FieldSystem * ov5_021DF574(const UnkStruct_ov5_021DF47C * param0); -UnkStruct_ov5_021DF47C * ov5_021DF578(const LocalMapObject * param0); +UnkStruct_ov5_021DF47C * ov5_021DF578(const MapObject * param0); u32 ov5_021DF5A8(UnkStruct_ov5_021DF47C * param0, u32 param1); void ov5_021DF5B4(UnkStruct_ov5_021DF47C * param0, u32 param1, void * param2); void * ov5_021DF5C0(UnkStruct_ov5_021DF47C * param0, u32 param1, int param2); diff --git a/include/overlay005/ov5_021EB1A0.h b/include/overlay005/ov5_021EB1A0.h index cc83194b6e..8e8e7a0ffd 100644 --- a/include/overlay005/ov5_021EB1A0.h +++ b/include/overlay005/ov5_021EB1A0.h @@ -4,50 +4,50 @@ #include "struct_decls/struct_020216E0_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -UnkStruct_020216E0 * ov5_021EB1A0(LocalMapObject * param0); -void ov5_021EB2EC(LocalMapObject * param0); -void ov5_021EB314(LocalMapObject * param0); -void ov5_021EB328(LocalMapObject * param0); -void ov5_021EB354(LocalMapObject * param0); -void ov5_021EB398(LocalMapObject * param0); -void ov5_021EB40C(LocalMapObject * param0); -void ov5_021EB438(LocalMapObject * param0); -void ov5_021EB720(LocalMapObject * param0); -void ov5_021EB7F8(LocalMapObject * param0); -void ov5_021EB834(LocalMapObject * param0); -void ov5_021EB848(LocalMapObject * param0); -void ov5_021EB874(LocalMapObject * param0); -void ov5_021EB8B8(LocalMapObject * param0); -void ov5_021EB944(LocalMapObject * param0); -void ov5_021EBA0C(LocalMapObject * param0); -void ov5_021EBA34(LocalMapObject * param0); -void ov5_021EBA60(LocalMapObject * param0); -void ov5_021EBA8C(LocalMapObject * param0); -void ov5_021EBAD0(LocalMapObject * param0); -void ov5_021EBF50(LocalMapObject * param0); -void ov5_021EC15C(LocalMapObject * param0); -void ov5_021EC3F0(LocalMapObject * param0); -void ov5_021EC454(LocalMapObject * param0); -void ov5_021EC4BC(LocalMapObject * param0); -void ov5_021EC554(LocalMapObject * param0); -void ov5_021EC5C0(LocalMapObject * param0); -void ov5_021EC734(LocalMapObject * param0); -void ov5_021EC75C(LocalMapObject * param0); -void ov5_021EC760(LocalMapObject * param0); -void ov5_021EC778(LocalMapObject * param0); -void ov5_021EC790(LocalMapObject * param0); -void ov5_021EC7B8(LocalMapObject * param0); -void ov5_021EC7D0(LocalMapObject * param0); -void ov5_021EC7F0(LocalMapObject * param0); -void ov5_021EC824(LocalMapObject * param0); -void ov5_021EC858(LocalMapObject * param0); -void ov5_021EC86C(LocalMapObject * param0); -void ov5_021EC898(LocalMapObject * param0); -void ov5_021EC8EC(LocalMapObject * param0); -void ov5_021EC938(LocalMapObject * param0); -void ov5_021EC95C(LocalMapObject * param0); -void ov5_021EC970(LocalMapObject * param0); -void ov5_021EC9A0(LocalMapObject * param0); -void ov5_021EC9E8(LocalMapObject * param0); +UnkStruct_020216E0 * ov5_021EB1A0(MapObject * param0); +void ov5_021EB2EC(MapObject * param0); +void ov5_021EB314(MapObject * param0); +void ov5_021EB328(MapObject * param0); +void ov5_021EB354(MapObject * param0); +void ov5_021EB398(MapObject * param0); +void ov5_021EB40C(MapObject * param0); +void ov5_021EB438(MapObject * param0); +void ov5_021EB720(MapObject * param0); +void ov5_021EB7F8(MapObject * param0); +void ov5_021EB834(MapObject * param0); +void ov5_021EB848(MapObject * param0); +void ov5_021EB874(MapObject * param0); +void ov5_021EB8B8(MapObject * param0); +void ov5_021EB944(MapObject * param0); +void ov5_021EBA0C(MapObject * param0); +void ov5_021EBA34(MapObject * param0); +void ov5_021EBA60(MapObject * param0); +void ov5_021EBA8C(MapObject * param0); +void ov5_021EBAD0(MapObject * param0); +void ov5_021EBF50(MapObject * param0); +void ov5_021EC15C(MapObject * param0); +void ov5_021EC3F0(MapObject * param0); +void ov5_021EC454(MapObject * param0); +void ov5_021EC4BC(MapObject * param0); +void ov5_021EC554(MapObject * param0); +void ov5_021EC5C0(MapObject * param0); +void ov5_021EC734(MapObject * param0); +void ov5_021EC75C(MapObject * param0); +void ov5_021EC760(MapObject * param0); +void ov5_021EC778(MapObject * param0); +void ov5_021EC790(MapObject * param0); +void ov5_021EC7B8(MapObject * param0); +void ov5_021EC7D0(MapObject * param0); +void ov5_021EC7F0(MapObject * param0); +void ov5_021EC824(MapObject * param0); +void ov5_021EC858(MapObject * param0); +void ov5_021EC86C(MapObject * param0); +void ov5_021EC898(MapObject * param0); +void ov5_021EC8EC(MapObject * param0); +void ov5_021EC938(MapObject * param0); +void ov5_021EC95C(MapObject * param0); +void ov5_021EC970(MapObject * param0); +void ov5_021EC9A0(MapObject * param0); +void ov5_021EC9E8(MapObject * param0); #endif // POKEPLATINUM_OV5_021EB1A0_H diff --git a/include/overlay005/ov5_021ECA70.h b/include/overlay005/ov5_021ECA70.h index 391a5753ad..2d04c3e3e8 100644 --- a/include/overlay005/ov5_021ECA70.h +++ b/include/overlay005/ov5_021ECA70.h @@ -5,15 +5,15 @@ #include "struct_decls/struct_02061AB4_decl.h" #include "overlay005/struct_ov5_021ECB8C_decl.h" -void ov5_021ECA70(LocalMapObject * param0); -void ov5_021ECA90(LocalMapObject * param0); -void ov5_021ECABC(LocalMapObject * param0); -void ov5_021ECAC4(LocalMapObject * param0); -void ov5_021ECAF0(LocalMapObject * param0); -void ov5_021ECB34(LocalMapObject * param0); -void ov5_021ECB58(LocalMapObject * param0); -void ov5_021ECB78(LocalMapObject * param0); -UnkStruct_020216E0 * ov5_021ECB80(LocalMapObject * param0); +void ov5_021ECA70(MapObject * param0); +void ov5_021ECA90(MapObject * param0); +void ov5_021ECABC(MapObject * param0); +void ov5_021ECAC4(MapObject * param0); +void ov5_021ECAF0(MapObject * param0); +void ov5_021ECB34(MapObject * param0); +void ov5_021ECB58(MapObject * param0); +void ov5_021ECB78(MapObject * param0); +UnkStruct_020216E0 * ov5_021ECB80(MapObject * param0); UnkStruct_020216E0 * ov5_021ECB8C(UnkStruct_ov5_021ECB8C * param0); #endif // POKEPLATINUM_OV5_021ECA70_H diff --git a/include/overlay005/ov5_021ECC20.h b/include/overlay005/ov5_021ECC20.h index 7347d0bfa8..159327b88b 100644 --- a/include/overlay005/ov5_021ECC20.h +++ b/include/overlay005/ov5_021ECC20.h @@ -9,16 +9,16 @@ void ov5_021ECC20(MapObjectManager * param0, int param1, int param2, const int * param3, int param4); void ov5_021ECC78(MapObjectManager * param0); -void ov5_021ECCC8(LocalMapObject * param0); -const UnkStruct_ov5_021ECD10 * ov5_021ECD04(const LocalMapObject * param0); -int ov5_021ECD38(const LocalMapObject * param0); +void ov5_021ECCC8(MapObject * param0); +const UnkStruct_ov5_021ECD10 * ov5_021ECD04(const MapObject * param0); +int ov5_021ECD38(const MapObject * param0); void * ov5_021ECD68(const MapObjectManager * param0, u32 param1, int param2); -void ov5_021ECDA0(const LocalMapObject * param0, VecFx32 * param1); -void ov5_021ECDFC(LocalMapObject * param0, int param1); -void ov5_021ECE18(LocalMapObject * param0); -void ov5_021ECE30(LocalMapObject * param0); -void ov5_021ECE34(LocalMapObject * param0); -void ov5_021ECE38(LocalMapObject * param0); -void ov5_021ECE3C(LocalMapObject * param0); +void ov5_021ECDA0(const MapObject * param0, VecFx32 * param1); +void ov5_021ECDFC(MapObject * param0, int param1); +void ov5_021ECE18(MapObject * param0); +void ov5_021ECE30(MapObject * param0); +void ov5_021ECE34(MapObject * param0); +void ov5_021ECE38(MapObject * param0); +void ov5_021ECE3C(MapObject * param0); #endif // POKEPLATINUM_OV5_021ECC20_H diff --git a/include/overlay005/ov5_021ECE40.h b/include/overlay005/ov5_021ECE40.h index d3c1c88751..7a41cd58f3 100644 --- a/include/overlay005/ov5_021ECE40.h +++ b/include/overlay005/ov5_021ECE40.h @@ -14,18 +14,18 @@ void ov5_021ECE40(UnkStruct_ov5_021ED0A4 * param0, const MapObjectManager * param1, int param2, int param3, int param4, int param5, const int * param6, int param7); void ov5_021ECE94(UnkStruct_ov5_021ED0A4 * param0); -int ov5_021ECEB4(LocalMapObject * param0, UnkStruct_020216E0 ** param1, int param2); -int ov5_021ECF04(LocalMapObject * param0, UnkStruct_020216E0 ** param1); -UnkStruct_020216E0 * ov5_021ECF1C(LocalMapObject * param0, int param1); -void ov5_021ECF70(const LocalMapObject * param0, UnkStruct_020216E0 ** param1, int param2); -void ov5_021ECFA4(const LocalMapObject * param0, UnkStruct_020216E0 ** param1); -void ov5_021ECFD8(const LocalMapObject * param0, UnkStruct_020216E0 ** param1, int param2); +int ov5_021ECEB4(MapObject * param0, UnkStruct_020216E0 ** param1, int param2); +int ov5_021ECF04(MapObject * param0, UnkStruct_020216E0 ** param1); +UnkStruct_020216E0 * ov5_021ECF1C(MapObject * param0, int param1); +void ov5_021ECF70(const MapObject * param0, UnkStruct_020216E0 ** param1, int param2); +void ov5_021ECFA4(const MapObject * param0, UnkStruct_020216E0 ** param1); +void ov5_021ECFD8(const MapObject * param0, UnkStruct_020216E0 ** param1, int param2); void ov5_021ED01C(UnkStruct_020216E0 * param0, UnkStruct_ov5_021ED01C * param1); void ov5_021ED03C(UnkStruct_020216E0 * param0, UnkStruct_ov5_021ED01C * param1); -void ov5_021ED060(LocalMapObject * param0, UnkStruct_020216E0 ** param1, int param2); +void ov5_021ED060(MapObject * param0, UnkStruct_020216E0 ** param1, int param2); int ov5_021ED150(const MapObjectManager * param0, u32 param1, UnkStruct_ov5_021DF84C * param2); void ov5_021EDA38(MapObjectManager * param0, UnkStruct_ov5_021ED0A4 * param1); -void ov5_021EDBC4(const MapObjectManager * param0, int param1, LocalMapObject * param2); +void ov5_021EDBC4(const MapObjectManager * param0, int param1, MapObject * param2); void ov5_021EDC84(UnkStruct_ov5_021ED0A4 * param0, UnkStruct_02020C44 * param1); UnkStruct_02020C44 * ov5_021EDC8C(UnkStruct_ov5_021ED0A4 * param0); void ov5_021EDC94(UnkStruct_ov5_021ED0A4 * param0, int param1); @@ -33,13 +33,13 @@ UnkStruct_0202298C * ov5_021EDC98(const UnkStruct_ov5_021ED0A4 * param0); UnkStruct_0202298C * ov5_021EDCA0(const UnkStruct_ov5_021ED0A4 * param0); void ov5_021EDCA8(UnkStruct_ov5_021ED0A4 * param0, UnkStruct_02022BD8 * param1); UnkStruct_02022BD8 * ov5_021EDCB0(const UnkStruct_ov5_021ED0A4 * param0); -void ov5_021EDD78(LocalMapObject * param0, int param1); -int ov5_021EDD94(LocalMapObject * param0); -BOOL ov5_021EDEB4(LocalMapObject * param0, UnkStruct_020216E0 * param1); -void ov5_021EDED8(LocalMapObject * param0, UnkStruct_020216E0 * param1); +void ov5_021EDD78(MapObject * param0, int param1); +int ov5_021EDD94(MapObject * param0); +BOOL ov5_021EDEB4(MapObject * param0, UnkStruct_020216E0 * param1); +void ov5_021EDED8(MapObject * param0, UnkStruct_020216E0 * param1); int ov5_021EDF18(int param0); int ov5_021EDF24(int param0); int ov5_021EDF30(int param0); -UnkStruct_020216E0 * ov5_021EE3FC(LocalMapObject * param0, int param1, UnkFuncPtr_ov5_021EE454 param2, void * param3); +UnkStruct_020216E0 * ov5_021EE3FC(MapObject * param0, int param1, UnkFuncPtr_ov5_021EE454 param2, void * param3); #endif // POKEPLATINUM_OV5_021ECE40_H diff --git a/include/overlay005/ov5_021F10E8.h b/include/overlay005/ov5_021F10E8.h index e6eb546b43..e3e58c8287 100644 --- a/include/overlay005/ov5_021F10E8.h +++ b/include/overlay005/ov5_021F10E8.h @@ -13,7 +13,7 @@ void ov5_021F10FC(void * param0); void ov5_021F1188(UnkStruct_ov5_021DF47C * param0, u32 param1); void ov5_021F11C0(UnkStruct_ov5_021DF47C * param0, u32 param1, u32 param2); UnkStruct_02073B50 * ov5_021F11FC(UnkStruct_ov5_021DF47C * param0, u32 param1); -UnkStruct_ov101_021D5D90 * ov5_021F121C(const LocalMapObject * param0, const VecFx32 * param1); +UnkStruct_ov101_021D5D90 * ov5_021F121C(const MapObject * param0, const VecFx32 * param1); void ov5_021F1328(UnkStruct_ov5_021DF47C * param0); #endif // POKEPLATINUM_OV5_021F10E8_H diff --git a/include/overlay005/ov5_021F134C.h b/include/overlay005/ov5_021F134C.h index 0b9b97a8f8..28bb3f381b 100644 --- a/include/overlay005/ov5_021F134C.h +++ b/include/overlay005/ov5_021F134C.h @@ -7,7 +7,7 @@ void * ov5_021F134C(UnkStruct_ov5_021DF47C * param0); void ov5_021F1370(void * param0); -void ov5_021F1570(LocalMapObject * param0); -UnkStruct_ov101_021D5D90 * ov5_021F16D4(LocalMapObject * param0, int param1); +void ov5_021F1570(MapObject * param0); +UnkStruct_ov101_021D5D90 * ov5_021F16D4(MapObject * param0, int param1); #endif // POKEPLATINUM_OV5_021F134C_H diff --git a/include/overlay005/ov5_021F17B8.h b/include/overlay005/ov5_021F17B8.h index 4b490524ea..932e8ed848 100644 --- a/include/overlay005/ov5_021F17B8.h +++ b/include/overlay005/ov5_021F17B8.h @@ -11,7 +11,7 @@ void * ov5_021F17B8(UnkStruct_ov5_021DF47C * param0); void ov5_021F17D4(void * param0); -void ov5_021F1800(LocalMapObject * param0, int param1); +void ov5_021F1800(MapObject * param0, int param1); UnkStruct_ov101_021D5D90 * ov5_021F1BA4(UnkStruct_ov5_021DF47C * param0, const UnkStruct_ov5_021DF84C * param1, const UnkStruct_020216E0 * param2, const VecFx32 * param3, int param4, int param5); #endif // POKEPLATINUM_OV5_021F17B8_H diff --git a/include/overlay005/ov5_021F1CC8.h b/include/overlay005/ov5_021F1CC8.h index 58a271c62f..cee0189d96 100644 --- a/include/overlay005/ov5_021F1CC8.h +++ b/include/overlay005/ov5_021F1CC8.h @@ -7,11 +7,11 @@ void * ov5_021F1CC8(UnkStruct_ov5_021DF47C * param0); void ov5_021F1CE8(void * param0); -UnkStruct_ov101_021D5D90 * ov5_021F1E8C(const LocalMapObject * param0); -UnkStruct_ov101_021D5D90 * ov5_021F1E98(const LocalMapObject * param0); -UnkStruct_ov101_021D5D90 * ov5_021F1EA4(const LocalMapObject * param0); -UnkStruct_ov101_021D5D90 * ov5_021F1EB0(const LocalMapObject * param0); -UnkStruct_ov101_021D5D90 * ov5_021F1EBC(const LocalMapObject * param0); -UnkStruct_ov101_021D5D90 * ov5_021F1EC8(const LocalMapObject * param0); +UnkStruct_ov101_021D5D90 * ov5_021F1E8C(const MapObject * param0); +UnkStruct_ov101_021D5D90 * ov5_021F1E98(const MapObject * param0); +UnkStruct_ov101_021D5D90 * ov5_021F1EA4(const MapObject * param0); +UnkStruct_ov101_021D5D90 * ov5_021F1EB0(const MapObject * param0); +UnkStruct_ov101_021D5D90 * ov5_021F1EBC(const MapObject * param0); +UnkStruct_ov101_021D5D90 * ov5_021F1EC8(const MapObject * param0); #endif // POKEPLATINUM_OV5_021F1CC8_H diff --git a/include/overlay005/ov5_021F204C.h b/include/overlay005/ov5_021F204C.h index b48919aa1d..63d255cbb5 100644 --- a/include/overlay005/ov5_021F204C.h +++ b/include/overlay005/ov5_021F204C.h @@ -7,9 +7,9 @@ void * ov5_021F204C(UnkStruct_ov5_021DF47C * param0); void ov5_021F2068(void * param0); -void ov5_021F20D4(LocalMapObject * param0); +void ov5_021F20D4(MapObject * param0); void * ov5_021F21E0(UnkStruct_ov5_021DF47C * param0); void ov5_021F21F4(void * param0); -UnkStruct_ov101_021D5D90 * ov5_021F22BC(LocalMapObject * param0); +UnkStruct_ov101_021D5D90 * ov5_021F22BC(MapObject * param0); #endif // POKEPLATINUM_OV5_021F204C_H diff --git a/include/overlay005/ov5_021F23D0.h b/include/overlay005/ov5_021F23D0.h index 19f84b753d..d9f17bf8fa 100644 --- a/include/overlay005/ov5_021F23D0.h +++ b/include/overlay005/ov5_021F23D0.h @@ -7,7 +7,7 @@ void * ov5_021F23D0(UnkStruct_ov5_021DF47C * param0); void ov5_021F23EC(void * param0); -UnkStruct_ov101_021D5D90 * ov5_021F2438(LocalMapObject * param0); +UnkStruct_ov101_021D5D90 * ov5_021F2438(MapObject * param0); void ov5_021F247C(UnkStruct_ov101_021D5D90 * param0); #endif // POKEPLATINUM_OV5_021F23D0_H diff --git a/include/overlay005/ov5_021F25C0.h b/include/overlay005/ov5_021F25C0.h index 1ca75cc699..c37c5aa7d3 100644 --- a/include/overlay005/ov5_021F25C0.h +++ b/include/overlay005/ov5_021F25C0.h @@ -7,7 +7,7 @@ void * ov5_021F25C0(UnkStruct_ov5_021DF47C * param0); void ov5_021F25DC(void * param0); -UnkStruct_ov101_021D5D90 * ov5_021F261C(LocalMapObject * param0, int param1, int param2, int param3, int param4); +UnkStruct_ov101_021D5D90 * ov5_021F261C(MapObject * param0, int param1, int param2, int param3, int param4); void ov5_021F2838(UnkStruct_ov101_021D5D90 * param0, int param1); #endif // POKEPLATINUM_OV5_021F25C0_H diff --git a/include/overlay005/ov5_021F2850.h b/include/overlay005/ov5_021F2850.h index b80fcb2163..6d180cc551 100644 --- a/include/overlay005/ov5_021F2850.h +++ b/include/overlay005/ov5_021F2850.h @@ -7,7 +7,7 @@ void * ov5_021F2850(UnkStruct_ov5_021DF47C * param0); void ov5_021F2864(void * param0); -UnkStruct_ov101_021D5D90 * ov5_021F28F4(LocalMapObject * param0, int param1, int param2, int param3, int param4); +UnkStruct_ov101_021D5D90 * ov5_021F28F4(MapObject * param0, int param1, int param2, int param3, int param4); void ov5_021F2974(UnkStruct_ov101_021D5D90 * param0, int param1); #endif // POKEPLATINUM_OV5_021F2850_H diff --git a/include/overlay005/ov5_021F2A7C.h b/include/overlay005/ov5_021F2A7C.h index 7795e7a227..e14f2cbd27 100644 --- a/include/overlay005/ov5_021F2A7C.h +++ b/include/overlay005/ov5_021F2A7C.h @@ -6,6 +6,6 @@ void * ov5_021F2A7C(UnkStruct_ov5_021DF47C * param0); void ov5_021F2A98(void * param0); -void ov5_021F2AE4(LocalMapObject * param0, int param1, int param2, int param3); +void ov5_021F2AE4(MapObject * param0, int param1, int param2, int param3); #endif // POKEPLATINUM_OV5_021F2A7C_H diff --git a/include/overlay005/ov5_021F2BD0.h b/include/overlay005/ov5_021F2BD0.h index 2d3e9ffc2f..85af779b45 100644 --- a/include/overlay005/ov5_021F2BD0.h +++ b/include/overlay005/ov5_021F2BD0.h @@ -6,6 +6,6 @@ void * ov5_021F2BD0(UnkStruct_ov5_021DF47C * param0); void ov5_021F2BEC(void * param0); -void ov5_021F2C38(LocalMapObject * param0, int param1, int param2, int param3); +void ov5_021F2C38(MapObject * param0, int param1, int param2, int param3); #endif // POKEPLATINUM_OV5_021F2BD0_H diff --git a/include/overlay005/ov5_021F2D20.h b/include/overlay005/ov5_021F2D20.h index a9a1cbf0bd..a8a8d57a7a 100644 --- a/include/overlay005/ov5_021F2D20.h +++ b/include/overlay005/ov5_021F2D20.h @@ -8,7 +8,7 @@ void * ov5_021F2D20(UnkStruct_ov5_021DF47C * param0); void ov5_021F2D3C(void * param0); -void ov5_021F2EA4(LocalMapObject * param0, int param1); +void ov5_021F2EA4(MapObject * param0, int param1); UnkStruct_ov101_021D5D90 * ov5_021F3154(FieldSystem * param0, int param1, int param2, int param3); int ov5_021F31A8(UnkStruct_ov101_021D5D90 * param0); diff --git a/include/overlay005/ov5_021F3284.h b/include/overlay005/ov5_021F3284.h index d4d6e12c98..dd72f3b901 100644 --- a/include/overlay005/ov5_021F3284.h +++ b/include/overlay005/ov5_021F3284.h @@ -6,6 +6,6 @@ void * ov5_021F3284(UnkStruct_ov5_021DF47C * param0); void ov5_021F32A0(void * param0); -void ov5_021F331C(LocalMapObject * param0, int param1); +void ov5_021F331C(MapObject * param0, int param1); #endif // POKEPLATINUM_OV5_021F3284_H diff --git a/include/overlay005/ov5_021F348C.h b/include/overlay005/ov5_021F348C.h index f4df185a8e..a778d39802 100644 --- a/include/overlay005/ov5_021F348C.h +++ b/include/overlay005/ov5_021F348C.h @@ -7,7 +7,7 @@ void * ov5_021F348C(UnkStruct_ov5_021DF47C * param0); void ov5_021F34A8(void * param0); void ov5_021F34B8(UnkStruct_ov5_021DF47C * param0); -void ov5_021F3638(LocalMapObject * param0); -void ov5_021F3678(LocalMapObject * param0, int param1); +void ov5_021F3638(MapObject * param0); +void ov5_021F3678(MapObject * param0, int param1); #endif // POKEPLATINUM_OV5_021F348C_H diff --git a/include/overlay005/ov5_021F37A8.h b/include/overlay005/ov5_021F37A8.h index 7063616d05..e736b6f611 100644 --- a/include/overlay005/ov5_021F37A8.h +++ b/include/overlay005/ov5_021F37A8.h @@ -6,6 +6,6 @@ void * ov5_021F37A8(UnkStruct_ov5_021DF47C * param0); void ov5_021F37C4(void * param0); -void ov5_021F3844(LocalMapObject * param0, int param1); +void ov5_021F3844(MapObject * param0, int param1); #endif // POKEPLATINUM_OV5_021F37A8_H diff --git a/include/overlay005/ov5_021F3A50.h b/include/overlay005/ov5_021F3A50.h index 1150951b54..27413f171d 100644 --- a/include/overlay005/ov5_021F3A50.h +++ b/include/overlay005/ov5_021F3A50.h @@ -6,6 +6,6 @@ void * ov5_021F3A50(UnkStruct_ov5_021DF47C * param0); void ov5_021F3A6C(void * param0); -void ov5_021F3AEC(LocalMapObject * param0, int param1); +void ov5_021F3AEC(MapObject * param0, int param1); #endif // POKEPLATINUM_OV5_021F3A50_H diff --git a/include/overlay005/ov5_021F3D00.h b/include/overlay005/ov5_021F3D00.h index 6c550b99b3..b19c77b36d 100644 --- a/include/overlay005/ov5_021F3D00.h +++ b/include/overlay005/ov5_021F3D00.h @@ -7,6 +7,6 @@ void * ov5_021F3D00(UnkStruct_ov5_021DF47C * param0); void ov5_021F3D1C(void * param0); -UnkStruct_ov101_021D5D90 * ov5_021F3D90(LocalMapObject * param0, int param1); +UnkStruct_ov101_021D5D90 * ov5_021F3D90(MapObject * param0, int param1); #endif // POKEPLATINUM_OV5_021F3D00_H diff --git a/include/overlay005/ov5_021F3E74.h b/include/overlay005/ov5_021F3E74.h index 5cf010833c..33a4c7425e 100644 --- a/include/overlay005/ov5_021F3E74.h +++ b/include/overlay005/ov5_021F3E74.h @@ -6,6 +6,6 @@ void * ov5_021F3E74(UnkStruct_ov5_021DF47C * param0); void ov5_021F3E90(void * param0); -void ov5_021F3F10(LocalMapObject * param0); +void ov5_021F3F10(MapObject * param0); #endif // POKEPLATINUM_OV5_021F3E74_H diff --git a/include/overlay005/ov5_021F47B0.h b/include/overlay005/ov5_021F47B0.h index 4bc5cb0650..85370050d1 100644 --- a/include/overlay005/ov5_021F47B0.h +++ b/include/overlay005/ov5_021F47B0.h @@ -7,7 +7,7 @@ void * ov5_021F47B0(UnkStruct_ov5_021DF47C * param0); void ov5_021F47CC(void * param0); -UnkStruct_ov101_021D5D90 * ov5_021F4840(UnkStruct_ov5_021DF47C * param0, const LocalMapObject * param1, int param2, int param3); +UnkStruct_ov101_021D5D90 * ov5_021F4840(UnkStruct_ov5_021DF47C * param0, const MapObject * param1, int param2, int param3); UnkStruct_ov101_021D5D90 * ov5_021F4CEC(UnkStruct_ov5_021DF47C * param0, int param1, int param2, int param3); #endif // POKEPLATINUM_OV5_021F47B0_H diff --git a/include/overlay005/ov5_021F50BC.h b/include/overlay005/ov5_021F50BC.h index ac4ef3b8d7..c5a780701b 100644 --- a/include/overlay005/ov5_021F50BC.h +++ b/include/overlay005/ov5_021F50BC.h @@ -7,6 +7,6 @@ void * ov5_021F50BC(UnkStruct_ov5_021DF47C * param0); void ov5_021F50D8(void * param0); -UnkStruct_ov101_021D5D90 * ov5_021F511C(LocalMapObject * param0); +UnkStruct_ov101_021D5D90 * ov5_021F511C(MapObject * param0); #endif // POKEPLATINUM_OV5_021F50BC_H diff --git a/include/overlay005/ov5_021F5284.h b/include/overlay005/ov5_021F5284.h index e2698da587..e92d42a3f4 100644 --- a/include/overlay005/ov5_021F5284.h +++ b/include/overlay005/ov5_021F5284.h @@ -7,6 +7,6 @@ void * ov5_021F5284(UnkStruct_ov5_021DF47C * param0); void ov5_021F52A0(void * param0); -UnkStruct_ov101_021D5D90 * ov5_021F52E4(LocalMapObject * param0); +UnkStruct_ov101_021D5D90 * ov5_021F52E4(MapObject * param0); #endif // POKEPLATINUM_OV5_021F5284_H diff --git a/include/overlay005/ov5_021F5428.h b/include/overlay005/ov5_021F5428.h index 8bd429e8c6..7168a0d427 100644 --- a/include/overlay005/ov5_021F5428.h +++ b/include/overlay005/ov5_021F5428.h @@ -7,6 +7,6 @@ void * ov5_021F5428(UnkStruct_ov5_021DF47C * param0); void ov5_021F5444(void * param0); -UnkStruct_ov101_021D5D90 * ov5_021F5488(LocalMapObject * param0); +UnkStruct_ov101_021D5D90 * ov5_021F5488(MapObject * param0); #endif // POKEPLATINUM_OV5_021F5428_H diff --git a/include/overlay005/ov5_021F5894.h b/include/overlay005/ov5_021F5894.h index b0905ddb55..0d57ed5eaf 100644 --- a/include/overlay005/ov5_021F5894.h +++ b/include/overlay005/ov5_021F5894.h @@ -6,6 +6,6 @@ void * ov5_021F5894(UnkStruct_ov5_021DF47C * param0); void ov5_021F58B0(void * param0); -void ov5_021F58FC(LocalMapObject * param0, int param1, int param2, int param3); +void ov5_021F58FC(MapObject * param0, int param1, int param2, int param3); #endif // POKEPLATINUM_OV5_021F5894_H diff --git a/include/overlay005/ov5_021F5A10.h b/include/overlay005/ov5_021F5A10.h index 282fe334f7..331732d108 100644 --- a/include/overlay005/ov5_021F5A10.h +++ b/include/overlay005/ov5_021F5A10.h @@ -11,6 +11,6 @@ void ov5_021F5A24(void * param0); void ov5_021F5AA4(FieldSystem * param0, BOOL param1); int ov5_021F5C4C(UnkStruct_ov101_021D5D90 * param0); void ov5_021F5C58(UnkStruct_ov101_021D5D90 * param0); -UnkStruct_ov101_021D5D90 * ov5_021F5D8C(LocalMapObject * param0, int param1, int param2, int param3); +UnkStruct_ov101_021D5D90 * ov5_021F5D8C(MapObject * param0, int param1, int param2, int param3); #endif // POKEPLATINUM_OV5_021F5A10_H diff --git a/include/overlay005/ov5_021F600C.h b/include/overlay005/ov5_021F600C.h index 966c3f3652..c45039cfe1 100644 --- a/include/overlay005/ov5_021F600C.h +++ b/include/overlay005/ov5_021F600C.h @@ -7,6 +7,6 @@ void * ov5_021F600C(UnkStruct_ov5_021DF47C * param0); void ov5_021F6028(void * param0); -UnkStruct_ov101_021D5D90 * ov5_021F6094(LocalMapObject * param0); +UnkStruct_ov101_021D5D90 * ov5_021F6094(MapObject * param0); #endif // POKEPLATINUM_OV5_021F600C_H diff --git a/include/overlay005/struct_ov5_021EE294.h b/include/overlay005/struct_ov5_021EE294.h index c53c707a56..67ea42a0f8 100644 --- a/include/overlay005/struct_ov5_021EE294.h +++ b/include/overlay005/struct_ov5_021EE294.h @@ -6,7 +6,7 @@ typedef struct { int unk_00; - LocalMapObject * unk_04; + MapObject * unk_04; UnkStruct_020216E0 ** unk_08; } UnkStruct_ov5_021EE294; diff --git a/include/overlay009/ov9_02249960.h b/include/overlay009/ov9_02249960.h index 4beb0d8abf..8d6295c32f 100644 --- a/include/overlay009/ov9_02249960.h +++ b/include/overlay009/ov9_02249960.h @@ -12,7 +12,7 @@ void ov9_02249A60(FieldSystem * param0); BOOL ov9_02249E50(FieldSystem * param0, const int param1, const int param2, const fx32 param3, BOOL * param4); void ov9_02249F9C(FieldSystem * param0); void ov9_02249FD0(FieldSystem * param0); -int ov9_0224A520(FieldSystem * param0, LocalMapObject * param1); +int ov9_0224A520(FieldSystem * param0, MapObject * param1); void ov9_0224A558(FieldSystem * param0, UnkStruct_020216E0 * param1, int param2); void ov9_0224A564(FieldSystem * param0, const UnkStruct_020216E0 * param1); BOOL ov9_0224A59C(FieldSystem * param0, int param1); @@ -25,9 +25,9 @@ void ov9_0224E884(FieldSystem * param0, u16 param1); void ov9_0224E8A8(FieldSystem * param0); void ov9_0224F158(FieldSystem * param0, u16 param1); void ov9_0224F16C(FieldSystem * param0, u16 param1); -BOOL ov9_0224F240(const LocalMapObject * param0, int param1); -BOOL ov9_0224F2B0(const LocalMapObject * param0); -UnkStruct_ov9_0224F6EC * ov9_0224F2BC(FieldSystem * param0, TaskManager * param1, LocalMapObject * param2); +BOOL ov9_0224F240(const MapObject * param0, int param1); +BOOL ov9_0224F2B0(const MapObject * param0); +UnkStruct_ov9_0224F6EC * ov9_0224F2BC(FieldSystem * param0, TaskManager * param1, MapObject * param2); BOOL ov9_0224F6EC(UnkStruct_ov9_0224F6EC * param0); void ov9_02250780(FieldSystem * param0); BOOL ov9_02250F74(FieldSystem * param0); diff --git a/include/struct_decls/struct_02061AB4_decl.h b/include/struct_decls/struct_02061AB4_decl.h index ac3f10776a..ee2429c7cb 100644 --- a/include/struct_decls/struct_02061AB4_decl.h +++ b/include/struct_decls/struct_02061AB4_decl.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_02061AB4_DECL_H #define POKEPLATINUM_STRUCT_02061AB4_DECL_H -typedef struct UnkStruct_02061AB4_t LocalMapObject; +typedef struct UnkStruct_02061AB4_t MapObject; #endif // POKEPLATINUM_STRUCT_02061AB4_DECL_H diff --git a/include/struct_defs/struct_02070950.h b/include/struct_defs/struct_02070950.h index bb86b304d0..ad8d0ff69d 100644 --- a/include/struct_defs/struct_02070950.h +++ b/include/struct_defs/struct_02070950.h @@ -7,7 +7,7 @@ typedef struct UnkStruct_02070950_t { u32 unk_00; FieldSystem * unk_04; - LocalMapObject * unk_08; + MapObject * unk_08; u16 unk_0C; } UnkStruct_02070950; diff --git a/include/unk_0203C954.h b/include/unk_0203C954.h index 9d3ebe199b..e13b9bbbea 100644 --- a/include/unk_0203C954.h +++ b/include/unk_0203C954.h @@ -4,11 +4,11 @@ #include "field/field_system_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -void sub_0203C9D4(FieldSystem * param0, LocalMapObject ** param1); -u8 sub_0203CA40(FieldSystem * param0, LocalMapObject ** param1); +void sub_0203C9D4(FieldSystem * param0, MapObject ** param1); +u8 sub_0203CA40(FieldSystem * param0, MapObject ** param1); u16 sub_0203CA6C(FieldSystem * param0, void * param1, int param2); u16 sub_0203CB80(FieldSystem * param0, void * param1, int param2); -u8 sub_0203CBE0(FieldSystem * param0, LocalMapObject ** param1); +u8 sub_0203CBE0(FieldSystem * param0, MapObject ** param1); u16 sub_0203CC14(FieldSystem * param0, void * param1, int param2); #endif // POKEPLATINUM_UNK_0203C954_H diff --git a/include/unk_0203E880.h b/include/unk_0203E880.h index df9007b959..9cc0a9404c 100644 --- a/include/unk_0203E880.h +++ b/include/unk_0203E880.h @@ -8,10 +8,10 @@ #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -void sub_0203E880(FieldSystem * param0, u16 param1, LocalMapObject * param2); -void sub_0203E8B0(FieldSystem * param0, LocalMapObject * param1, int param2, int param3, int param4, int param5, int param6, int param7); -void sub_0203E8E0(TaskManager * param0, u16 param1, LocalMapObject * param2, void * param3); -void sub_0203E918(TaskManager * param0, u16 param1, LocalMapObject * param2); +void sub_0203E880(FieldSystem * param0, u16 param1, MapObject * param2); +void sub_0203E8B0(FieldSystem * param0, MapObject * param1, int param2, int param3, int param4, int param5, int param6, int param7); +void sub_0203E8E0(TaskManager * param0, u16 param1, MapObject * param2, void * param3); +void sub_0203E918(TaskManager * param0, u16 param1, MapObject * param2); ScriptContext * sub_0203EAB8(FieldSystem * param0, u16 param1); void * sub_0203EF60(UnkStruct_0203EF60 * param0, u32 param1); void * sub_0203F098(FieldSystem * param0, u32 param1); diff --git a/include/unk_02055C50.h b/include/unk_02055C50.h index 72a9362d21..2201cf1805 100644 --- a/include/unk_02055C50.h +++ b/include/unk_02055C50.h @@ -9,17 +9,17 @@ UnkStruct_02055CBC * sub_02055C8C(FieldSystem * param0, int param1); void sub_02055CBC(UnkStruct_02055CBC * param0); void sub_02055CD4(FieldSystem * param0, int param1); void sub_02055D94(FieldSystem * param0); -BOOL sub_02055E00(FieldSystem * param0, LocalMapObject * param1); -void sub_02055E80(FieldSystem * param0, LocalMapObject * param1, u16 param2); -void sub_02055EAC(FieldSystem * param0, LocalMapObject * param1, u16 param2); -void sub_02055EE0(FieldSystem * param0, LocalMapObject * param1); -int sub_02055F00(const FieldSystem * param0, const LocalMapObject * param1); -int sub_02055F20(const FieldSystem * param0, const LocalMapObject * param1); -u16 sub_02055F40(const FieldSystem * param0, const LocalMapObject * param1); -u16 sub_02055F64(const FieldSystem * param0, const LocalMapObject * param1); -int sub_02055F88(const FieldSystem * param0, const LocalMapObject * param1); -int sub_02055FA8(const FieldSystem * param0, const LocalMapObject * param1); -u32 sub_02055FC8(const FieldSystem * param0, const LocalMapObject * param1); +BOOL sub_02055E00(FieldSystem * param0, MapObject * param1); +void sub_02055E80(FieldSystem * param0, MapObject * param1, u16 param2); +void sub_02055EAC(FieldSystem * param0, MapObject * param1, u16 param2); +void sub_02055EE0(FieldSystem * param0, MapObject * param1); +int sub_02055F00(const FieldSystem * param0, const MapObject * param1); +int sub_02055F20(const FieldSystem * param0, const MapObject * param1); +u16 sub_02055F40(const FieldSystem * param0, const MapObject * param1); +u16 sub_02055F64(const FieldSystem * param0, const MapObject * param1); +int sub_02055F88(const FieldSystem * param0, const MapObject * param1); +int sub_02055FA8(const FieldSystem * param0, const MapObject * param1); +u32 sub_02055FC8(const FieldSystem * param0, const MapObject * param1); void sub_020562AC(FieldSystem * param0); void sub_020562D8(FieldSystem * param0); diff --git a/include/unk_0205DFC4.h b/include/unk_0205DFC4.h index 289a8e44c9..55bafb5cc5 100644 --- a/include/unk_0205DFC4.h +++ b/include/unk_0205DFC4.h @@ -11,8 +11,8 @@ u16 sub_0205E078(u16 param0, u16 param1); u16 sub_0205E0E4(u16 param0, u16 param1); u16 sub_0205E1B4(SaveData * param0); BOOL HasAllLegendaryTitansInParty(SaveData * param0); -void sub_0205E318(TaskManager * param0, LocalMapObject * param1, u16 param2, u16 param3, u16 param4, u16 param5); -void sub_0205E3F4(TaskManager * param0, LocalMapObject * param1, u16 param2, u16 param3); +void sub_0205E318(TaskManager * param0, MapObject * param1, u16 param2, u16 param3, u16 param4, u16 param5); +void sub_0205E3F4(TaskManager * param0, MapObject * param1, u16 param2, u16 param3); int sub_0205E430(u8 param0, u8 param1); int sub_0205E45C(u8 param0, u8 param1); int sub_0205E488(u8 param0, u8 param1); diff --git a/include/unk_0205E7D0.h b/include/unk_0205E7D0.h index b41f92127b..5911fa4f96 100644 --- a/include/unk_0205E7D0.h +++ b/include/unk_0205E7D0.h @@ -13,9 +13,9 @@ PlayerAvatar * PlayerAvatar_Init(const MapObjectManager * param0, int param1, int param2, int param3, int param4, int param5, int param6, UnkStruct_0205EC34 * param7); PlayerAvatar * sub_0205E820(const MapObjectManager * param0, UnkStruct_0205EC34 * param1, int param2); void sub_0205E884(PlayerAvatar * param0, int param1); -void sub_0205E8E0(PlayerAvatar * param0); void Player_Delete(PlayerAvatar * param0); -LocalMapObject * sub_0205EA24(const MapObjectManager * param0); +void Player_DeleteAll(PlayerAvatar * param0); +MapObject * sub_0205EA24(const MapObjectManager * param0); int Player_Dir(PlayerAvatar * const param0); void Player_SetDir(PlayerAvatar * param0, int param1); int sub_0205EA94(PlayerAvatar * const param0); @@ -31,9 +31,9 @@ int sub_0205EB0C(const PlayerAvatar * param0); void sub_0205EB10(PlayerAvatar * param0, int param1); 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); -const LocalMapObject * sub_0205EB54(const PlayerAvatar * param0); +void PlayerAvatar_SetMapObject(PlayerAvatar * param0, MapObject * param1); +MapObject * Player_MapObject(PlayerAvatar * param0); +const MapObject * sub_0205EB54(const PlayerAvatar * param0); void sub_0205EB58(PlayerAvatar * param0, int param1); int sub_0205EB74(PlayerAvatar * param0); void sub_0205EB84(PlayerAvatar * param0, u32 param1); diff --git a/include/unk_0205F180.h b/include/unk_0205F180.h index 341e609b1b..7d0c0b3664 100644 --- a/include/unk_0205F180.h +++ b/include/unk_0205F180.h @@ -11,8 +11,8 @@ void sub_0205F490(PlayerAvatar * param0); void sub_0205F56C(PlayerAvatar * param0); int sub_0205F588(PlayerAvatar * param0); void sub_0205F5E4(PlayerAvatar * param0, int param1); -u32 sub_02060B7C(PlayerAvatar * param0, LocalMapObject * param1, int param2); -u32 sub_020611FC(PlayerAvatar * param0, LocalMapObject * param1, int param2); +u32 sub_02060B7C(PlayerAvatar * param0, MapObject * param1, int param2); +u32 sub_020611FC(PlayerAvatar * param0, MapObject * param1, int param2); int sub_02061308(PlayerAvatar * param0, u16 param1, u16 param2); int sub_020613AC(PlayerAvatar * param0); int sub_020613FC(PlayerAvatar * param0, u16 param1); diff --git a/include/unk_02061804.h b/include/unk_02061804.h index abf4c91448..ec5b92b315 100644 --- a/include/unk_02061804.h +++ b/include/unk_02061804.h @@ -23,27 +23,27 @@ MapObjectManager * sub_02061804(FieldSystem * param0, int param1, int param2); void sub_02061830(MapObjectManager * param0); void sub_0206184C(MapObjectManager * param0, int param1, int param2, int param3, const UnkStruct_020619DC * param4); -LocalMapObject * sub_02061918(const MapObjectManager * param0, const UnkStruct_020619DC * param1, int param2); -LocalMapObject * sub_020619DC(const MapObjectManager * param0, int param1, int param2, int param3, int param4, int param5, int param6); -LocalMapObject * sub_02061A74(const MapObjectManager * param0, int param1, int param2, int param3, const UnkStruct_020619DC * param4); -void sub_02061AB4(LocalMapObject * param0, int param1); -void sub_02061AD4(LocalMapObject * param0, int param1); -void LocalMapObj_Delete(LocalMapObject * param0); -void sub_02061B28(LocalMapObject * param0); -void sub_02061B48(LocalMapObject * param0); +MapObject * sub_02061918(const MapObjectManager * param0, const UnkStruct_020619DC * param1, int param2); +MapObject * sub_020619DC(const MapObjectManager * param0, int param1, int param2, int param3, int param4, int param5, int param6); +MapObject * sub_02061A74(const MapObjectManager * param0, int param1, int param2, int param3, const UnkStruct_020619DC * param4); +void sub_02061AB4(MapObject * param0, int param1); +void sub_02061AD4(MapObject * param0, int param1); +void MapObject_Delete(MapObject * param0); +void sub_02061B28(MapObject * param0); +void sub_02061B48(MapObject * param0); void sub_02061BBC(MapObjectManager * param0); void sub_02061BF0(MapObjectManager * param0); void sub_02061C48(MapObjectManager * param0); void sub_02061CA8(FieldSystem * param0, const MapObjectManager * param1, UnkStruct_02061D3C * param2, int param3); void sub_02061D04(const MapObjectManager * param0, UnkStruct_02061D3C * param1, int param2); void sub_02062068(const MapObjectManager * param0, int param1, int param2, const UnkStruct_020619DC * param3); -LocalMapObject * MapObjMan_LocalMapObjByIndex(const MapObjectManager * param0, int param1); -LocalMapObject * sub_02062570(const MapObjectManager * param0, int param1); -int sub_020625B0(const MapObjectManager * param0, LocalMapObject ** param1, int * param2, u32 param3); -int sub_020626B4(const LocalMapObject * param0); -int sub_02062758(const LocalMapObject * param0, int param1); -int sub_02062764(const LocalMapObject * param0, int param1, int param2); -int sub_020627B4(const LocalMapObject * param0, int param1, int param2, int param3); +MapObject * MapObjMan_LocalMapObjByIndex(const MapObjectManager * param0, int param1); +MapObject * sub_02062570(const MapObjectManager * param0, int param1); +int sub_020625B0(const MapObjectManager * param0, MapObject ** param1, int * param2, u32 param3); +int sub_020626B4(const MapObject * param0); +int sub_02062758(const MapObject * param0, int param1); +int sub_02062764(const MapObject * param0, int param1, int param2); +int sub_020627B4(const MapObject * param0, int param1, int param2, int param3); void sub_02062820(MapObjectManager * param0, int param1); int sub_02062824(const MapObjectManager * param0); void sub_02062838(MapObjectManager * param0, u32 param1); @@ -52,175 +52,175 @@ u32 sub_0206284C(const MapObjectManager * param0, u32 param1); void sub_02062854(MapObjectManager * param0, int param1); int sub_02062858(const MapObjectManager * param0); UnkStruct_ov5_021ED0A4 * sub_0206285C(const MapObjectManager * param0); -void sub_02062860(MapObjectManager * param0, LocalMapObject * param1); -const LocalMapObject * sub_02062868(const MapObjectManager * param0); -LocalMapObject * sub_02062878(const MapObjectManager * param0); -void sub_02062880(const LocalMapObject ** param0); +void sub_02062860(MapObjectManager * param0, MapObject * param1); +const MapObject * sub_02062868(const MapObjectManager * param0); +MapObject * sub_02062878(const MapObjectManager * param0); +void sub_02062880(const MapObject ** param0); void sub_0206288C(MapObjectManager * param0, FieldSystem * param1); FieldSystem * sub_02062894(const MapObjectManager * param0); void sub_0206289C(MapObjectManager * param0, NARC * param1); NARC * sub_020628A0(const MapObjectManager * param0); -void sub_020628B4(LocalMapObject * param0, u32 param1); -u32 sub_020628B8(const LocalMapObject * param0); -void sub_020628BC(LocalMapObject * param0, u32 param1); -void sub_020628C4(LocalMapObject * param0, u32 param1); -u32 sub_020628D0(const LocalMapObject * param0, u32 param1); -u32 sub_020628D8(const LocalMapObject * param0, u32 param1); -void sub_020628E8(LocalMapObject * param0, u32 param1); -u32 sub_020628EC(const LocalMapObject * param0); -void sub_020628F0(LocalMapObject * param0, u32 param1); -void sub_020628F8(LocalMapObject * param0, u32 param1); -u32 sub_02062904(const LocalMapObject * param0, u32 param1); -void LocalMapObj_SetId(LocalMapObject * param0, u32 param1); -u32 sub_02062910(const LocalMapObject * param0); -void sub_02062914(LocalMapObject * param0, int param1); -int sub_02062918(const LocalMapObject * param0); -void sub_0206291C(LocalMapObject * param0, u32 param1); -u32 sub_02062920(const LocalMapObject * param0); -u32 sub_02062924(const LocalMapObject * param0); -void sub_02062944(LocalMapObject * param0, u32 param1); -u32 sub_02062948(const LocalMapObject * param0); -void sub_0206294C(LocalMapObject * param0, u32 param1); -u32 sub_02062950(const LocalMapObject * param0); -void sub_02062954(LocalMapObject * param0, u32 param1); -u32 sub_02062958(const LocalMapObject * param0); -void sub_0206295C(LocalMapObject * param0, u32 param1); -u32 sub_02062960(const LocalMapObject * param0); -void sub_02062964(LocalMapObject * param0, int param1); -u32 sub_02062968(const LocalMapObject * param0); -void sub_0206296C(LocalMapObject * param0, int param1); -void sub_02062974(LocalMapObject * param0, int param1); -int sub_0206298C(const LocalMapObject * param0); -int sub_02062990(const LocalMapObject * param0); -void sub_02062994(LocalMapObject * param0, int param1); -int sub_0206299C(const LocalMapObject * param0); -void sub_020629A0(LocalMapObject * param0, int param1); -void sub_020629B4(LocalMapObject * param0, int param1, int param2); -int sub_020629D8(const LocalMapObject * param0, int param1); -void sub_020629FC(LocalMapObject * param0, int param1); -int sub_02062A00(const LocalMapObject * param0); -void sub_02062A04(LocalMapObject * param0, int param1); -int sub_02062A08(const LocalMapObject * param0); -void sub_02062A0C(LocalMapObject * param0, u32 param1); -u32 sub_02062A14(const LocalMapObject * param0); -void sub_02062A1C(LocalMapObject * param0, SysTask * param1); -SysTask * sub_02062A24(const LocalMapObject * param0); -void sub_02062A2C(const LocalMapObject * param0); -void sub_02062A38(LocalMapObject * param0, const MapObjectManager * param1); -const MapObjectManager * sub_02062A40(const LocalMapObject * param0); -void * sub_02062A54(LocalMapObject * param0, int param1); -void * sub_02062A78(LocalMapObject * param0); -void * sub_02062A7C(LocalMapObject * param0, int param1); -void * sub_02062AA0(LocalMapObject * param0); -void * sub_02062AA4(LocalMapObject * param0, int param1); -void * sub_02062AC8(LocalMapObject * param0); -void * sub_02062ACC(LocalMapObject * param0, int param1); -void * sub_02062AF0(LocalMapObject * param0); -void sub_02062AF8(LocalMapObject * param0, UnkFuncPtr_020EDF0C param1); -void sub_02062B00(LocalMapObject * param0); -void sub_02062B0C(LocalMapObject * param0, UnkFuncPtr_020EDF0C_1 param1); -void sub_02062B14(LocalMapObject * param0); -void sub_02062B20(LocalMapObject * param0, UnkFuncPtr_020EDF0C_2 param1); -void sub_02062B28(LocalMapObject * param0); -void sub_02062B34(LocalMapObject * param0); -void sub_02062B4C(LocalMapObject * param0, UnkFuncPtr_ov5_021FB0F0 param1); -void sub_02062B54(LocalMapObject * param0); -void sub_02062B60(LocalMapObject * param0, UnkFuncPtr_ov5_021FB0F0_1 param1); -void sub_02062B68(LocalMapObject * param0); -void sub_02062B74(LocalMapObject * param0, UnkFuncPtr_ov5_021FB0F0_2 param1); -void sub_02062B7C(LocalMapObject * param0); -void sub_02062B88(LocalMapObject * param0, UnkFuncPtr_ov5_021FB0F0_3 param1); -void sub_02062B90(LocalMapObject * param0); -void sub_02062B9C(LocalMapObject * param0, UnkFuncPtr_ov5_021FB0F0_4 param1); -void sub_02062BA4(LocalMapObject * param0); -void sub_02062BB0(LocalMapObject * param0, int param1); -int sub_02062BB8(const LocalMapObject * param0); -void sub_02062BC0(LocalMapObject * param0, int param1); -void sub_02062BC8(LocalMapObject * param0); -int sub_02062BD8(const LocalMapObject * param0); -void sub_02062BE0(LocalMapObject * param0, u32 param1); -u32 sub_02062BE8(const LocalMapObject * param0); -void sub_02062BF0(LocalMapObject * param0, u32 param1); -u32 sub_02062BF8(const LocalMapObject * param0); -FieldSystem * sub_02062C00(const LocalMapObject * param0); -int sub_02062C0C(const LocalMapObject * param0); -int sub_02062C18(const LocalMapObject * param0); +void sub_020628B4(MapObject * param0, u32 param1); +u32 sub_020628B8(const MapObject * param0); +void MapObject_SetFlagOn(MapObject * param0, u32 param1); +void MapObject_SetFlagOff(MapObject * param0, u32 param1); +u32 sub_020628D0(const MapObject * param0, u32 param1); +u32 sub_020628D8(const MapObject * param0, u32 param1); +void sub_020628E8(MapObject * param0, u32 param1); +u32 sub_020628EC(const MapObject * param0); +void sub_020628F0(MapObject * param0, u32 param1); +void sub_020628F8(MapObject * param0, u32 param1); +u32 sub_02062904(const MapObject * param0, u32 param1); +void LocalMapObj_SetId(MapObject * param0, u32 param1); +u32 sub_02062910(const MapObject * param0); +void sub_02062914(MapObject * param0, int param1); +int sub_02062918(const MapObject * param0); +void sub_0206291C(MapObject * param0, u32 param1); +u32 sub_02062920(const MapObject * param0); +u32 sub_02062924(const MapObject * param0); +void sub_02062944(MapObject * param0, u32 param1); +u32 sub_02062948(const MapObject * param0); +void sub_0206294C(MapObject * param0, u32 param1); +u32 sub_02062950(const MapObject * param0); +void sub_02062954(MapObject * param0, u32 param1); +u32 sub_02062958(const MapObject * param0); +void sub_0206295C(MapObject * param0, u32 param1); +u32 sub_02062960(const MapObject * param0); +void sub_02062964(MapObject * param0, int param1); +u32 sub_02062968(const MapObject * param0); +void sub_0206296C(MapObject * param0, int param1); +void sub_02062974(MapObject * param0, int param1); +int sub_0206298C(const MapObject * param0); +int sub_02062990(const MapObject * param0); +void sub_02062994(MapObject * param0, int param1); +int sub_0206299C(const MapObject * param0); +void sub_020629A0(MapObject * param0, int param1); +void sub_020629B4(MapObject * param0, int param1, int param2); +int sub_020629D8(const MapObject * param0, int param1); +void sub_020629FC(MapObject * param0, int param1); +int sub_02062A00(const MapObject * param0); +void sub_02062A04(MapObject * param0, int param1); +int sub_02062A08(const MapObject * param0); +void sub_02062A0C(MapObject * param0, u32 param1); +u32 sub_02062A14(const MapObject * param0); +void sub_02062A1C(MapObject * param0, SysTask * param1); +SysTask * sub_02062A24(const MapObject * param0); +void sub_02062A2C(const MapObject * param0); +void sub_02062A38(MapObject * param0, const MapObjectManager * param1); +const MapObjectManager * sub_02062A40(const MapObject * param0); +void * sub_02062A54(MapObject * param0, int param1); +void * sub_02062A78(MapObject * param0); +void * sub_02062A7C(MapObject * param0, int param1); +void * sub_02062AA0(MapObject * param0); +void * sub_02062AA4(MapObject * param0, int param1); +void * sub_02062AC8(MapObject * param0); +void * sub_02062ACC(MapObject * param0, int param1); +void * sub_02062AF0(MapObject * param0); +void sub_02062AF8(MapObject * param0, UnkFuncPtr_020EDF0C param1); +void sub_02062B00(MapObject * param0); +void sub_02062B0C(MapObject * param0, UnkFuncPtr_020EDF0C_1 param1); +void sub_02062B14(MapObject * param0); +void sub_02062B20(MapObject * param0, UnkFuncPtr_020EDF0C_2 param1); +void sub_02062B28(MapObject * param0); +void sub_02062B34(MapObject * param0); +void sub_02062B4C(MapObject * param0, UnkFuncPtr_ov5_021FB0F0 param1); +void sub_02062B54(MapObject * param0); +void sub_02062B60(MapObject * param0, UnkFuncPtr_ov5_021FB0F0_1 param1); +void sub_02062B68(MapObject * param0); +void sub_02062B74(MapObject * param0, UnkFuncPtr_ov5_021FB0F0_2 param1); +void sub_02062B7C(MapObject * param0); +void sub_02062B88(MapObject * param0, UnkFuncPtr_ov5_021FB0F0_3 param1); +void sub_02062B90(MapObject * param0); +void sub_02062B9C(MapObject * param0, UnkFuncPtr_ov5_021FB0F0_4 param1); +void sub_02062BA4(MapObject * param0); +void sub_02062BB0(MapObject * param0, int param1); +int sub_02062BB8(const MapObject * param0); +void sub_02062BC0(MapObject * param0, int param1); +void sub_02062BC8(MapObject * param0); +int sub_02062BD8(const MapObject * param0); +void sub_02062BE0(MapObject * param0, u32 param1); +u32 sub_02062BE8(const MapObject * param0); +void sub_02062BF0(MapObject * param0, u32 param1); +u32 sub_02062BF8(const MapObject * param0); +FieldSystem * sub_02062C00(const MapObject * param0); +int sub_02062C0C(const MapObject * param0); +int sub_02062C18(const MapObject * param0); void sub_02062C30(MapObjectManager * param0); void sub_02062C3C(MapObjectManager * param0); void MapObjectMan_PauseAllMovement(MapObjectManager * param0); void MapObjectMan_UnpauseAllMovement(MapObjectManager * param0); int sub_02062CA8(const MapObjectManager * param0); -u32 sub_02062CBC(const LocalMapObject * param0, u32 param1); +u32 sub_02062CBC(const MapObject * param0, u32 param1); void sub_02062CCC(MapObjectManager * param0, int param1); int sub_02062CE4(const MapObjectManager * param0); -int sub_02062CF8(const LocalMapObject * param0); -void sub_02062D04(LocalMapObject * param0); -void sub_02062D10(LocalMapObject * param0); -int sub_02062D1C(const LocalMapObject * param0); -void sub_02062D28(LocalMapObject * param0); -void sub_02062D34(LocalMapObject * param0); -void sub_02062D40(LocalMapObject * param0); -int sub_02062D4C(const LocalMapObject * param0); -int sub_02062D58(const LocalMapObject * param0); -void sub_02062D64(LocalMapObject * param0, int param1); -void sub_02062D80(LocalMapObject * param0, int param1); -int sub_02062D9C(LocalMapObject * param0); -void sub_02062DB4(LocalMapObject * param0, int param1); -void sub_02062DD0(LocalMapObject * param0); -void sub_02062DDC(LocalMapObject * param0); -int sub_02062DE8(const LocalMapObject * param0); -int sub_02062DFC(const LocalMapObject * param0); -void sub_02062E28(LocalMapObject * param0, int param1); -int sub_02062E44(const LocalMapObject * param0); -void sub_02062E5C(LocalMapObject * param0, int param1); -void sub_02062E78(LocalMapObject * param0, int param1); -int sub_02062E94(const LocalMapObject * param0); -void sub_02062EAC(LocalMapObject * param0, int param1); -int sub_02062EC8(const LocalMapObject * param0); -void sub_02062EE0(LocalMapObject * param0, int param1); -int sub_02062EFC(const LocalMapObject * param0); -void sub_02062F14(LocalMapObject * param0, int param1); -int sub_02062F30(const LocalMapObject * param0); -void sub_02062F48(LocalMapObject * param0, int param1); -int sub_02062F64(const LocalMapObject * param0); -int sub_02062F7C(const LocalMapObject * param0); -void sub_02062F90(LocalMapObject * param0, int param1); -int sub_02062FAC(const LocalMapObject * param0); -void sub_02062FC4(LocalMapObject * param0, int param1); -int sub_02062FDC(const LocalMapObject * param0); -int sub_02062FF0(const LocalMapObject * param0); -void sub_02062FF4(LocalMapObject * param0, int param1); -int sub_02062FF8(const LocalMapObject * param0); -void sub_02062FFC(LocalMapObject * param0, int param1); -int sub_02063000(const LocalMapObject * param0); -void sub_02063004(LocalMapObject * param0, int param1); -int sub_02063008(const LocalMapObject * param0); -void sub_0206300C(LocalMapObject * param0, int param1); -int sub_02063010(const LocalMapObject * param0); -void sub_02063014(LocalMapObject * param0, int param1); -int sub_02063018(const LocalMapObject * param0); -void sub_0206301C(LocalMapObject * param0, int param1); -int sub_02063020(const LocalMapObject * param0); -void LocalMapObj_SetX(LocalMapObject * param0, int param1); -void sub_02063028(LocalMapObject * param0, int param1); -int sub_02063030(const LocalMapObject * param0); -void sub_02063034(LocalMapObject * param0, int param1); -void sub_02063038(LocalMapObject * param0, int param1); -int sub_02063040(const LocalMapObject * param0); -void LocalMapObj_SetZ(LocalMapObject * param0, int param1); -void sub_02063048(LocalMapObject * param0, int param1); -void sub_02063050(const LocalMapObject * param0, VecFx32 * param1); -void sub_02063060(LocalMapObject * param0, const VecFx32 * param1); -const VecFx32 * sub_02063070(const LocalMapObject * param0); -fx32 sub_02063074(const LocalMapObject * param0); -void sub_02063078(const LocalMapObject * param0, VecFx32 * param1); -void sub_02063088(LocalMapObject * param0, const VecFx32 * param1); -VecFx32 * sub_02063098(LocalMapObject * param0); -void sub_0206309C(const LocalMapObject * param0, VecFx32 * param1); -void sub_020630AC(LocalMapObject * param0, const VecFx32 * param1); -void sub_020630BC(const LocalMapObject * param0, VecFx32 * param1); -void sub_020630CC(LocalMapObject * param0, const VecFx32 * param1); -int sub_020630DC(const LocalMapObject * param0); +int sub_02062CF8(const MapObject * param0); +void sub_02062D04(MapObject * param0); +void sub_02062D10(MapObject * param0); +int sub_02062D1C(const MapObject * param0); +void sub_02062D28(MapObject * param0); +void sub_02062D34(MapObject * param0); +void sub_02062D40(MapObject * param0); +int sub_02062D4C(const MapObject * param0); +int sub_02062D58(const MapObject * param0); +void sub_02062D64(MapObject * param0, int param1); +void sub_02062D80(MapObject * param0, int param1); +int sub_02062D9C(MapObject * param0); +void sub_02062DB4(MapObject * param0, int param1); +void sub_02062DD0(MapObject * param0); +void sub_02062DDC(MapObject * param0); +int sub_02062DE8(const MapObject * param0); +int sub_02062DFC(const MapObject * param0); +void sub_02062E28(MapObject * param0, int param1); +int sub_02062E44(const MapObject * param0); +void sub_02062E5C(MapObject * param0, int param1); +void sub_02062E78(MapObject * param0, int param1); +int sub_02062E94(const MapObject * param0); +void sub_02062EAC(MapObject * param0, int param1); +int sub_02062EC8(const MapObject * param0); +void sub_02062EE0(MapObject * param0, int param1); +int sub_02062EFC(const MapObject * param0); +void sub_02062F14(MapObject * param0, int param1); +int sub_02062F30(const MapObject * param0); +void sub_02062F48(MapObject * param0, int param1); +int sub_02062F64(const MapObject * param0); +int sub_02062F7C(const MapObject * param0); +void sub_02062F90(MapObject * param0, int param1); +int sub_02062FAC(const MapObject * param0); +void sub_02062FC4(MapObject * param0, int param1); +int sub_02062FDC(const MapObject * param0); +int sub_02062FF0(const MapObject * param0); +void sub_02062FF4(MapObject * param0, int param1); +int sub_02062FF8(const MapObject * param0); +void sub_02062FFC(MapObject * param0, int param1); +int sub_02063000(const MapObject * param0); +void sub_02063004(MapObject * param0, int param1); +int sub_02063008(const MapObject * param0); +void sub_0206300C(MapObject * param0, int param1); +int sub_02063010(const MapObject * param0); +void sub_02063014(MapObject * param0, int param1); +int sub_02063018(const MapObject * param0); +void sub_0206301C(MapObject * param0, int param1); +int sub_02063020(const MapObject * param0); +void LocalMapObj_SetX(MapObject * param0, int param1); +void sub_02063028(MapObject * param0, int param1); +int sub_02063030(const MapObject * param0); +void sub_02063034(MapObject * param0, int param1); +void sub_02063038(MapObject * param0, int param1); +int sub_02063040(const MapObject * param0); +void LocalMapObj_SetZ(MapObject * param0, int param1); +void sub_02063048(MapObject * param0, int param1); +void sub_02063050(const MapObject * param0, VecFx32 * param1); +void sub_02063060(MapObject * param0, const VecFx32 * param1); +const VecFx32 * sub_02063070(const MapObject * param0); +fx32 sub_02063074(const MapObject * param0); +void sub_02063078(const MapObject * param0, VecFx32 * param1); +void sub_02063088(MapObject * param0, const VecFx32 * param1); +VecFx32 * sub_02063098(MapObject * param0); +void sub_0206309C(const MapObject * param0, VecFx32 * param1); +void sub_020630AC(MapObject * param0, const VecFx32 * param1); +void sub_020630BC(const MapObject * param0, VecFx32 * param1); +void sub_020630CC(MapObject * param0, const VecFx32 * param1); +int sub_020630DC(const MapObject * param0); void sub_020630F0(UnkStruct_020619DC * param0, int param1); int sub_020630F4(const UnkStruct_020619DC * param0); void sub_020630F8(UnkStruct_020619DC * param0, int param1); @@ -247,18 +247,18 @@ void sub_02063194(UnkStruct_020619DC * param0, int param1); int sub_02063198(const UnkStruct_020619DC * param0); void sub_0206319C(UnkStruct_020619DC * param0, int param1); int sub_020631A0(const UnkStruct_020619DC * param0); -LocalMapObject * sub_0206326C(const MapObjectManager * param0, int param1, int param2, int param3); -void sub_020632D4(LocalMapObject * param0, const VecFx32 * param1, int param2); -void LocalMapObj_SetPosDir(LocalMapObject * param0, int param1, int param2, int param3, int param4); -void sub_020633A8(LocalMapObject * param0, u32 param1); -void sub_020633C8(LocalMapObject * param0, int param1); -void sub_020633E0(LocalMapObject * param0); -void sub_020633E4(LocalMapObject * param0); -void sub_020633E8(LocalMapObject * param0); -void sub_020633EC(LocalMapObject * param0); -void sub_020633F0(LocalMapObject * param0); -void sub_020633F4(LocalMapObject * param0); -void sub_020633F8(LocalMapObject * param0); -void sub_020633FC(LocalMapObject * param0); +MapObject * sub_0206326C(const MapObjectManager * param0, int param1, int param2, int param3); +void sub_020632D4(MapObject * param0, const VecFx32 * param1, int param2); +void LocalMapObj_SetPosDir(MapObject * param0, int param1, int param2, int param3, int param4); +void sub_020633A8(MapObject * param0, u32 param1); +void sub_020633C8(MapObject * param0, int param1); +void sub_020633E0(MapObject * param0); +void sub_020633E4(MapObject * param0); +void sub_020633E8(MapObject * param0); +void sub_020633EC(MapObject * param0); +void sub_020633F0(MapObject * param0); +void sub_020633F4(MapObject * param0); +void sub_020633F8(MapObject * param0); +void sub_020633FC(MapObject * param0); #endif // POKEPLATINUM_UNK_02061804_H diff --git a/include/unk_02063400.h b/include/unk_02063400.h index ccfee50390..b66ac6e791 100644 --- a/include/unk_02063400.h +++ b/include/unk_02063400.h @@ -6,33 +6,33 @@ #include -void sub_02063400(LocalMapObject * param0); -void sub_02063410(LocalMapObject * param0); -u32 sub_02063E18(const LocalMapObject * param0, const VecFx32 * param1, int param2, int param3, int param4, int param5); -u32 sub_02063E94(const LocalMapObject * param0, int param1, int param2, int param3, int param4); -u32 sub_02063EBC(const LocalMapObject * param0, int param1); -int sub_02063F00(const LocalMapObject * param0, int param1, int param2, int param3); -int sub_02063FAC(const LocalMapObject * param0, int param1, int param2, int param3); -int sub_02064004(const LocalMapObject * param0, int param1, int param2, int param3); -int sub_0206406C(LocalMapObject * param0, u32 param1); -int sub_020640A0(LocalMapObject * param0, u32 param1); -int sub_020640D4(LocalMapObject * param0, u32 param1); -int sub_02064108(LocalMapObject * param0, u32 param1); -int sub_0206413C(LocalMapObject * param0, u32 param1); -int sub_0206415C(LocalMapObject * param0, u32 param1); -int sub_0206417C(LocalMapObject * param0, u32 param1); +void sub_02063400(MapObject * param0); +void sub_02063410(MapObject * param0); +u32 sub_02063E18(const MapObject * param0, const VecFx32 * param1, int param2, int param3, int param4, int param5); +u32 sub_02063E94(const MapObject * param0, int param1, int param2, int param3, int param4); +u32 sub_02063EBC(const MapObject * param0, int param1); +int sub_02063F00(const MapObject * param0, int param1, int param2, int param3); +int sub_02063FAC(const MapObject * param0, int param1, int param2, int param3); +int sub_02064004(const MapObject * param0, int param1, int param2, int param3); +int sub_0206406C(MapObject * param0, u32 param1); +int sub_020640A0(MapObject * param0, u32 param1); +int sub_020640D4(MapObject * param0, u32 param1); +int sub_02064108(MapObject * param0, u32 param1); +int sub_0206413C(MapObject * param0, u32 param1); +int sub_0206415C(MapObject * param0, u32 param1); +int sub_0206417C(MapObject * param0, u32 param1); int sub_0206419C(int param0); int sub_020641A8(int param0); -void sub_020641B4(LocalMapObject * param0, int param1); -void sub_02064208(LocalMapObject * param0); -u32 sub_02064238(LocalMapObject * param0, int param1); -void sub_02064270(LocalMapObject * param0, const VecFx32 * param1); -void sub_020642A4(LocalMapObject * param0, int param1, fx32 param2); -int sub_020642F8(LocalMapObject * param0); -int sub_02064390(LocalMapObject * param0); +void sub_020641B4(MapObject * param0, int param1); +void sub_02064208(MapObject * param0); +u32 sub_02064238(MapObject * param0, int param1); +void sub_02064270(MapObject * param0, const VecFx32 * param1); +void sub_020642A4(MapObject * param0, int param1, fx32 param2); +int sub_020642F8(MapObject * param0); +int sub_02064390(MapObject * param0); void sub_02064418(int param0, VecFx32 * param1, fx32 param2); void sub_02064450(int param0, int param1, VecFx32 * param2); -void sub_02064464(LocalMapObject * param0); +void sub_02064464(MapObject * param0); int sub_0206447C(int param0); int sub_02064488(int param0, int param1, int param2, int param3); int sub_020644A4(FieldSystem * param0, VecFx32 * param1); diff --git a/include/unk_0206450C.h b/include/unk_0206450C.h index 23465830d4..277cd20cce 100644 --- a/include/unk_0206450C.h +++ b/include/unk_0206450C.h @@ -3,61 +3,61 @@ #include "struct_decls/struct_02061AB4_decl.h" -void sub_0206453C(LocalMapObject * param0); -void sub_02064548(LocalMapObject * param0); -void sub_02064554(LocalMapObject * param0); -void sub_02064560(LocalMapObject * param0); -void sub_0206456C(LocalMapObject * param0); -void sub_02064578(LocalMapObject * param0); -void sub_02064584(LocalMapObject * param0); -void sub_02064590(LocalMapObject * param0); -void sub_0206459C(LocalMapObject * param0); -void sub_020645A8(LocalMapObject * param0); -void sub_020645B4(LocalMapObject * param0); -void sub_020645C0(LocalMapObject * param0); -void sub_02064624(LocalMapObject * param0); -void sub_02064628(LocalMapObject * param0); -void sub_02064638(LocalMapObject * param0); -void sub_02064648(LocalMapObject * param0); -void sub_02064658(LocalMapObject * param0); -void sub_02064690(LocalMapObject * param0); -void sub_02064918(LocalMapObject * param0); -void sub_0206493C(LocalMapObject * param0); -void sub_02064948(LocalMapObject * param0); -void sub_02064954(LocalMapObject * param0); -void sub_02064960(LocalMapObject * param0); -void sub_02064990(LocalMapObject * param0); -void sub_0206499C(LocalMapObject * param0); -void sub_020649A8(LocalMapObject * param0); -void sub_02064AF0(LocalMapObject * param0); -void sub_02064AFC(LocalMapObject * param0); -void sub_02064C28(LocalMapObject * param0); -void sub_02064C48(LocalMapObject * param0); -void sub_02064DC8(LocalMapObject * param0); -void sub_02064DD8(LocalMapObject * param0); -void sub_02064DE8(LocalMapObject * param0); -void sub_02064DF8(LocalMapObject * param0); -void sub_02064E08(LocalMapObject * param0); -void sub_02064E18(LocalMapObject * param0); -void sub_02064E28(LocalMapObject * param0); -void sub_02064E38(LocalMapObject * param0); -void sub_02064E48(LocalMapObject * param0); -void sub_02064E58(LocalMapObject * param0); -void sub_02064E68(LocalMapObject * param0); -void sub_02064E78(LocalMapObject * param0); -void sub_02064E88(LocalMapObject * param0); -void sub_02064E98(LocalMapObject * param0); -void sub_02064EA8(LocalMapObject * param0); -void sub_02064EB8(LocalMapObject * param0); -void sub_02064EC8(LocalMapObject * param0); -void sub_0206505C(LocalMapObject * param0); -void sub_0206506C(LocalMapObject * param0); -void sub_0206507C(LocalMapObject * param0); -void sub_0206508C(LocalMapObject * param0); -void sub_0206509C(LocalMapObject * param0); -void sub_020650AC(LocalMapObject * param0); -void sub_020650BC(LocalMapObject * param0); -void sub_020650CC(LocalMapObject * param0); -void sub_020650DC(LocalMapObject * param0); +void sub_0206453C(MapObject * param0); +void sub_02064548(MapObject * param0); +void sub_02064554(MapObject * param0); +void sub_02064560(MapObject * param0); +void sub_0206456C(MapObject * param0); +void sub_02064578(MapObject * param0); +void sub_02064584(MapObject * param0); +void sub_02064590(MapObject * param0); +void sub_0206459C(MapObject * param0); +void sub_020645A8(MapObject * param0); +void sub_020645B4(MapObject * param0); +void sub_020645C0(MapObject * param0); +void sub_02064624(MapObject * param0); +void sub_02064628(MapObject * param0); +void sub_02064638(MapObject * param0); +void sub_02064648(MapObject * param0); +void sub_02064658(MapObject * param0); +void sub_02064690(MapObject * param0); +void sub_02064918(MapObject * param0); +void sub_0206493C(MapObject * param0); +void sub_02064948(MapObject * param0); +void sub_02064954(MapObject * param0); +void sub_02064960(MapObject * param0); +void sub_02064990(MapObject * param0); +void sub_0206499C(MapObject * param0); +void sub_020649A8(MapObject * param0); +void sub_02064AF0(MapObject * param0); +void sub_02064AFC(MapObject * param0); +void sub_02064C28(MapObject * param0); +void sub_02064C48(MapObject * param0); +void sub_02064DC8(MapObject * param0); +void sub_02064DD8(MapObject * param0); +void sub_02064DE8(MapObject * param0); +void sub_02064DF8(MapObject * param0); +void sub_02064E08(MapObject * param0); +void sub_02064E18(MapObject * param0); +void sub_02064E28(MapObject * param0); +void sub_02064E38(MapObject * param0); +void sub_02064E48(MapObject * param0); +void sub_02064E58(MapObject * param0); +void sub_02064E68(MapObject * param0); +void sub_02064E78(MapObject * param0); +void sub_02064E88(MapObject * param0); +void sub_02064E98(MapObject * param0); +void sub_02064EA8(MapObject * param0); +void sub_02064EB8(MapObject * param0); +void sub_02064EC8(MapObject * param0); +void sub_0206505C(MapObject * param0); +void sub_0206506C(MapObject * param0); +void sub_0206507C(MapObject * param0); +void sub_0206508C(MapObject * param0); +void sub_0206509C(MapObject * param0); +void sub_020650AC(MapObject * param0); +void sub_020650BC(MapObject * param0); +void sub_020650CC(MapObject * param0); +void sub_020650DC(MapObject * param0); #endif // POKEPLATINUM_UNK_0206450C_H diff --git a/include/unk_020655F4.h b/include/unk_020655F4.h index b2866138f4..09c27c24cf 100644 --- a/include/unk_020655F4.h +++ b/include/unk_020655F4.h @@ -5,18 +5,18 @@ #include "struct_decls/struct_02061AB4_decl.h" #include "overlay005/struct_ov5_021F8E3C.h" -int LocalMapObj_IsAnimationSet(const LocalMapObject * param0); -void LocalMapObj_SetAnimationCode(LocalMapObject * param0, int param1); -void sub_02065668(LocalMapObject * param0, int param1); -int LocalMapObj_CheckAnimationFinished(const LocalMapObject * param0); -int sub_020656AC(LocalMapObject * param0); -void sub_020656DC(LocalMapObject * param0); -SysTask * sub_02065700(LocalMapObject * param0, const UnkStruct_ov5_021F8E3C * param1); +int LocalMapObj_IsAnimationSet(const MapObject * param0); +void LocalMapObj_SetAnimationCode(MapObject * param0, int param1); +void sub_02065668(MapObject * param0, int param1); +int LocalMapObj_CheckAnimationFinished(const MapObject * param0); +int sub_020656AC(MapObject * param0); +void sub_020656DC(MapObject * param0); +SysTask * sub_02065700(MapObject * param0, const UnkStruct_ov5_021F8E3C * param1); int sub_0206574C(SysTask * param0); void sub_02065758(SysTask * param0); int sub_02065838(int param0, int param1); int sub_0206587C(int param0); -void sub_020658B4(LocalMapObject * param0); -int sub_020658DC(LocalMapObject * param0); +void sub_020658B4(MapObject * param0); +int sub_020658DC(MapObject * param0); #endif // POKEPLATINUM_UNK_020655F4_H diff --git a/include/unk_020673B8.h b/include/unk_020673B8.h index 78f6732a66..2ccd359c1b 100644 --- a/include/unk_020673B8.h +++ b/include/unk_020673B8.h @@ -3,7 +3,7 @@ #include "struct_decls/struct_02061AB4_decl.h" -void sub_020673B8(LocalMapObject * param0); -int sub_020673C0(LocalMapObject * param0); +void sub_020673B8(MapObject * param0); +int sub_020673C0(MapObject * param0); #endif // POKEPLATINUM_UNK_020673B8_H diff --git a/include/unk_020677F4.h b/include/unk_020677F4.h index 015d2b1406..5c67a210e3 100644 --- a/include/unk_020677F4.h +++ b/include/unk_020677F4.h @@ -5,16 +5,16 @@ #include "struct_decls/struct_02061AB4_decl.h" int sub_020677F4(int param0); -int sub_02067800(const LocalMapObject * param0); -void sub_02067834(LocalMapObject * param0); -void sub_02067840(LocalMapObject * param0); -void sub_02067850(LocalMapObject * param0); -void sub_0206786C(LocalMapObject * param0); -void sub_02067870(LocalMapObject * param0); -void sub_02067890(LocalMapObject * param0); -void sub_02067950(LocalMapObject * param0); -void sub_02067968(LocalMapObject * param0); -void sub_02067998(LocalMapObject * param0); -UnkStruct_020216E0 * sub_02067A58(LocalMapObject * param0); +int sub_02067800(const MapObject * param0); +void sub_02067834(MapObject * param0); +void sub_02067840(MapObject * param0); +void sub_02067850(MapObject * param0); +void sub_0206786C(MapObject * param0); +void sub_02067870(MapObject * param0); +void sub_02067890(MapObject * param0); +void sub_02067950(MapObject * param0); +void sub_02067968(MapObject * param0); +void sub_02067998(MapObject * param0); +UnkStruct_020216E0 * sub_02067A58(MapObject * param0); #endif // POKEPLATINUM_UNK_020677F4_H diff --git a/include/unk_02067A84.h b/include/unk_02067A84.h index 128348d6b9..f331fb9a24 100644 --- a/include/unk_02067A84.h +++ b/include/unk_02067A84.h @@ -7,10 +7,10 @@ #include "struct_decls/struct_02061AB4_decl.h" int sub_02067A84(FieldSystem * param0, BOOL param1); -int sub_02067D58(const LocalMapObject * param0, PlayerAvatar * param1, int param2, int param3); -int sub_02067F24(LocalMapObject * param0); -int sub_02067F88(FieldSystem * param0, LocalMapObject * param1); -SysTask * sub_02067FB8(FieldSystem * param0, LocalMapObject * param1, PlayerAvatar * param2, int param3, int param4, int param5, int param6, int param7); +int sub_02067D58(const MapObject * param0, PlayerAvatar * param1, int param2, int param3); +int sub_02067F24(MapObject * param0); +int sub_02067F88(FieldSystem * param0, MapObject * param1); +SysTask * sub_02067FB8(FieldSystem * param0, MapObject * param1, PlayerAvatar * param2, int param3, int param4, int param5, int param6, int param7); int sub_02067FD4(SysTask * param0); void sub_02067FE8(SysTask * param0); diff --git a/include/unk_02069BE0.h b/include/unk_02069BE0.h index 1940ae8388..3829cdbbe3 100644 --- a/include/unk_02069BE0.h +++ b/include/unk_02069BE0.h @@ -4,37 +4,37 @@ #include "struct_decls/struct_02061AB4_decl.h" #include "overlay101/struct_ov101_021D5D90_decl.h" -void sub_02069BE0(LocalMapObject * param0); -void sub_02069C0C(LocalMapObject * param0); -void sub_02069C44(LocalMapObject * param0); -void sub_02069DF4(LocalMapObject * param0); -void sub_02069E1C(LocalMapObject * param0); -void sub_02069E4C(LocalMapObject * param0); -void sub_02069E50(LocalMapObject * param0); -LocalMapObject * sub_02069EB8(LocalMapObject * param0); -void sub_0206A104(LocalMapObject * param0); -void sub_0206A110(LocalMapObject * param0); -void sub_0206A11C(LocalMapObject * param0); -void sub_0206A128(LocalMapObject * param0); -void sub_0206A134(LocalMapObject * param0); -void sub_0206A158(LocalMapObject * param0); -void sub_0206A168(LocalMapObject * param0); -void sub_0206A218(LocalMapObject * param0, UnkStruct_ov101_021D5D90 * param1); -UnkStruct_ov101_021D5D90 * sub_0206A224(LocalMapObject * param0); -void sub_0206A230(LocalMapObject * param0); -void sub_0206A25C(LocalMapObject * param0); -void sub_0206A268(LocalMapObject * param0); -void sub_0206A274(LocalMapObject * param0); -void sub_0206A280(LocalMapObject * param0); -void sub_0206A28C(LocalMapObject * param0); -void sub_0206A298(LocalMapObject * param0); -void sub_0206A2A4(LocalMapObject * param0); -void sub_0206A2B0(LocalMapObject * param0); -void sub_0206A2BC(LocalMapObject * param0); -void sub_0206A490(LocalMapObject * param0); -void sub_0206A49C(LocalMapObject * param0); -void sub_0206A4A8(LocalMapObject * param0); -void sub_0206A4B4(LocalMapObject * param0); -void sub_0206A4C0(LocalMapObject * param0); +void sub_02069BE0(MapObject * param0); +void sub_02069C0C(MapObject * param0); +void sub_02069C44(MapObject * param0); +void sub_02069DF4(MapObject * param0); +void sub_02069E1C(MapObject * param0); +void sub_02069E4C(MapObject * param0); +void sub_02069E50(MapObject * param0); +MapObject * sub_02069EB8(MapObject * param0); +void sub_0206A104(MapObject * param0); +void sub_0206A110(MapObject * param0); +void sub_0206A11C(MapObject * param0); +void sub_0206A128(MapObject * param0); +void sub_0206A134(MapObject * param0); +void sub_0206A158(MapObject * param0); +void sub_0206A168(MapObject * param0); +void sub_0206A218(MapObject * param0, UnkStruct_ov101_021D5D90 * param1); +UnkStruct_ov101_021D5D90 * sub_0206A224(MapObject * param0); +void sub_0206A230(MapObject * param0); +void sub_0206A25C(MapObject * param0); +void sub_0206A268(MapObject * param0); +void sub_0206A274(MapObject * param0); +void sub_0206A280(MapObject * param0); +void sub_0206A28C(MapObject * param0); +void sub_0206A298(MapObject * param0); +void sub_0206A2A4(MapObject * param0); +void sub_0206A2B0(MapObject * param0); +void sub_0206A2BC(MapObject * param0); +void sub_0206A490(MapObject * param0); +void sub_0206A49C(MapObject * param0); +void sub_0206A4A8(MapObject * param0); +void sub_0206A4B4(MapObject * param0); +void sub_0206A4C0(MapObject * param0); #endif // POKEPLATINUM_UNK_02069BE0_H diff --git a/src/comm_player_manager.c b/src/comm_player_manager.c index 8bcb66c1b1..f92668dc73 100644 --- a/src/comm_player_manager.c +++ b/src/comm_player_manager.c @@ -191,7 +191,7 @@ void CommPlayerMan_Reinit (void) if (sCommPlayerManager->playerAvatar[netId] != NULL) { if (sCommPlayerManager->fieldSys->playerAvatar != sCommPlayerManager->playerAvatar[netId]) { if (sCommPlayerManager->isUnderground) { - Player_Delete(sCommPlayerManager->playerAvatar[netId]); + Player_DeleteAll(sCommPlayerManager->playerAvatar[netId]); } } @@ -394,10 +394,10 @@ static void CommPlayer_Add (u8 netId) if (trainerInfo) { if (!sCommPlayerManager->isUnderground) { if (netId != CommSys_CurNetId()) { - LocalMapObject * obj = MapObjMan_LocalMapObjByIndex(sCommPlayerManager->fieldSys->unk_38, 0xff + netId + 1); + MapObject * obj = MapObjMan_LocalMapObjByIndex(sCommPlayerManager->fieldSys->unk_38, 0xff + netId + 1); if (obj != 0) { - LocalMapObj_Delete(obj); + MapObject_Delete(obj); } } } @@ -415,7 +415,7 @@ static void CommPlayer_Add (u8 netId) GF_ASSERT(playerAvatar != NULL); sCommPlayerManager->playerAvatar[netId] = playerAvatar; - LocalMapObj_SetId(Player_LocalMapObject(playerAvatar), 0xff + netId + 1); + LocalMapObj_SetId(Player_MapObject(playerAvatar), 0xff + netId + 1); if (sCommPlayerManager->isUnderground) { UndergroundMan_SetReturnLog(netId); @@ -449,9 +449,9 @@ void CommPlayer_Destroy (u8 param0, BOOL param1, BOOL param2) if (sCommPlayerManager->playerAvatar[param0] != NULL) { if (sCommPlayerManager->fieldSys->playerAvatar != sCommPlayerManager->playerAvatar[param0]) { if (sCommPlayerManager->isUnderground || param2) { - Player_Delete(sCommPlayerManager->playerAvatar[param0]); + Player_DeleteAll(sCommPlayerManager->playerAvatar[param0]); } else { - sub_0205E8E0(sCommPlayerManager->playerAvatar[param0]); + Player_Delete(sCommPlayerManager->playerAvatar[param0]); } } @@ -947,7 +947,7 @@ static void sub_02058644 (int param0) static BOOL sub_020586A8 (int netId, int param1, int param2, int animSpeed) { - LocalMapObject * obj; + MapObject * obj; u8 walkAnimationCode[] = { 0x14, 0x15, 0x16, 0x17, 0x10, 0x11, 0x12, 0x13, 0xc, 0xd, 0xe, 0xf }; @@ -960,12 +960,12 @@ static BOOL sub_020586A8 (int netId, int param1, int param2, int animSpeed) return TRUE; } - obj = Player_LocalMapObject(sCommPlayerManager->playerAvatar[netId]); + obj = Player_MapObject(sCommPlayerManager->playerAvatar[netId]); if (Player_Dir(sCommPlayerManager->playerAvatar[netId]) != CommPlayer_GetOppositeDir(sCommPlayerManager->blowDir[netId])) { - sub_020628C4(obj, (1 << 7)); + MapObject_SetFlagOff(obj, (1 << 7)); Player_SetDir(sCommPlayerManager->playerAvatar[netId], CommPlayer_GetOppositeDir(sCommPlayerManager->blowDir[netId])); - sub_020628BC(obj, (1 << 7)); + MapObject_SetFlagOn(obj, (1 << 7)); } LocalMapObj_CheckAnimationFinished(obj); @@ -1214,34 +1214,34 @@ void sub_02058B94 (int param0) void sub_02058BA8 (int param0, int param1, BOOL param2) { - LocalMapObject * obj; + MapObject * obj; if (sCommPlayerManager->playerAvatar[param0] == NULL) { return; } - obj = Player_LocalMapObject(sCommPlayerManager->playerAvatar[param0]); + obj = Player_MapObject(sCommPlayerManager->playerAvatar[param0]); - sub_020628BC(obj, (1 << 7)); - sub_020628BC(obj, (1 << 8)); + MapObject_SetFlagOn(obj, (1 << 7)); + MapObject_SetFlagOn(obj, (1 << 8)); sCommPlayerManager->blowDir[param0] = param1; } void sub_02058BE8 (int param0) { - LocalMapObject * obj; + MapObject * obj; if (sCommPlayerManager->playerAvatar[param0] == NULL) { return; } if (sCommPlayerManager->blowDir[param0] != -1) { - obj = Player_LocalMapObject(sCommPlayerManager->playerAvatar[param0]); + obj = Player_MapObject(sCommPlayerManager->playerAvatar[param0]); sub_020656AC(obj); - sub_020628C4(obj, (1 << 7)); - sub_020628C4(obj, (1 << 8)); + MapObject_SetFlagOff(obj, (1 << 7)); + MapObject_SetFlagOff(obj, (1 << 8)); sCommPlayerManager->blowDir[param0] = -1; } @@ -1768,7 +1768,7 @@ void sub_02059570 (void) void CommPlayerMan_ForcePos (void) { int netId, x, z, dir; - LocalMapObject * obj; + MapObject * obj; if (!sCommPlayerManager) { return; @@ -1783,7 +1783,7 @@ void CommPlayerMan_ForcePos (void) continue; } - obj = Player_LocalMapObject(sCommPlayerManager->playerAvatar[netId]); + obj = Player_MapObject(sCommPlayerManager->playerAvatar[netId]); x = sCommPlayerManager->playerLocation[netId].x; z = sCommPlayerManager->playerLocation[netId].z; dir = sCommPlayerManager->playerLocation[netId].dir; diff --git a/src/overlay005/ov5_021D1C30.c b/src/overlay005/ov5_021D1C30.c index e0ca395db8..0e8b9f9bca 100644 --- a/src/overlay005/ov5_021D1C30.c +++ b/src/overlay005/ov5_021D1C30.c @@ -94,7 +94,7 @@ static u8 ov5_021D2CFC(const FieldSystem * param0); static u8 ov5_021D2D18(const FieldSystem * param0); static BOOL ov5_021D2D34(const FieldSystem * param0, int param1, int param2, UnkStruct_02049FA8 * param3); static void ov5_021D2E14(FieldSystem * param0); -static BOOL ov5_021D2EA4(FieldSystem * param0, LocalMapObject ** param1); +static BOOL ov5_021D2EA4(FieldSystem * param0, MapObject ** param1); static int ov5_021D2274(void); static void ov5_021D1C30 (UnkStruct_ov5_021D1CAC * param0) @@ -257,7 +257,7 @@ int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1) if (param0->unk_00_0) { { int v4; - LocalMapObject * v5; + MapObject * v5; if (sub_02071CB4(param1, 9) == 1) { v4 = ov5_021D2EA4(param1, &v5); @@ -361,7 +361,7 @@ int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1) static BOOL ov5_021D20DC (FieldSystem * param0) { - LocalMapObject * v0; + MapObject * v0; int v1; if (sub_0203CBE0(param0, &v0) == 1) { @@ -425,7 +425,7 @@ BOOL ov5_021D219C (UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1) if (param0->unk_00_0) { { - LocalMapObject * v0; + MapObject * v0; if (sub_0203CA40(param1, &v0) == 1) { UnkStruct_ov5_021D219C * v1; @@ -486,7 +486,7 @@ BOOL ov5_021D2298 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1) } if (param0->unk_00_0) { - LocalMapObject * v0; + MapObject * v0; if (sub_0203CA40(param1, &v0) == 1) { if (sub_0205F588(param1->playerAvatar) == 1) { @@ -529,7 +529,7 @@ int ov5_021D2368 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1) if (param0->unk_00_0) { { - LocalMapObject * v0; + MapObject * v0; if (sub_0203CA40(param1, &v0) == 1) { UnkStruct_ov5_021D219C * v1; @@ -1143,7 +1143,7 @@ static void ov5_021D2E14 (FieldSystem * param0) } } -static BOOL ov5_021D2EA4 (FieldSystem * param0, LocalMapObject ** param1) +static BOOL ov5_021D2EA4 (FieldSystem * param0, MapObject ** param1) { int v0 = 0; int v1, v2, v3, v4, v5, v6; diff --git a/src/overlay005/ov5_021D431C.c b/src/overlay005/ov5_021D431C.c index 01e212f27b..6d576a88d6 100644 --- a/src/overlay005/ov5_021D431C.c +++ b/src/overlay005/ov5_021D431C.c @@ -72,7 +72,7 @@ void ov5_021D4334 (const int param0, const int param1, UnkStruct_ov5_021D432C * BOOL ov5_021D433C (FieldSystem * param0, UnkStruct_ov5_021D432C * param1) { - LocalMapObject * v0; + MapObject * v0; switch (param1->unk_00) { case 0: @@ -176,12 +176,12 @@ BOOL ov5_021D433C (FieldSystem * param0, UnkStruct_ov5_021D432C * param1) } break; case 3: - v0 = Player_LocalMapObject(param0->playerAvatar); + v0 = Player_MapObject(param0->playerAvatar); LocalMapObj_SetAnimationCode(v0, 0xc); (param1->unk_00)++; break; case 4: - v0 = Player_LocalMapObject(param0->playerAvatar); + v0 = Player_MapObject(param0->playerAvatar); if (LocalMapObj_CheckAnimationFinished(v0) == 1) { sub_020656AC(v0); @@ -238,7 +238,7 @@ BOOL ov5_021D433C (FieldSystem * param0, UnkStruct_ov5_021D432C * param1) BOOL ov5_021D453C (FieldSystem * param0, UnkStruct_ov5_021D432C * param1) { - LocalMapObject * v0; + MapObject * v0; switch (param1->unk_00) { case 0: @@ -346,19 +346,19 @@ BOOL ov5_021D453C (FieldSystem * param0, UnkStruct_ov5_021D432C * param1) v12 = ov5_021D42F0(param0->unk_54, 1); if (v12) { - v0 = Player_LocalMapObject(param0->playerAvatar); + v0 = Player_MapObject(param0->playerAvatar); sub_02062D64(v0, 0); (param1->unk_00)++; } } break; case 3: - v0 = Player_LocalMapObject(param0->playerAvatar); + v0 = Player_MapObject(param0->playerAvatar); LocalMapObj_SetAnimationCode(v0, 0xd); (param1->unk_00)++; break; case 4: - v0 = Player_LocalMapObject(param0->playerAvatar); + v0 = Player_MapObject(param0->playerAvatar); if (LocalMapObj_CheckAnimationFinished(v0) == 1) { sub_020656AC(v0); @@ -493,7 +493,7 @@ static u8 ov5_021D481C (const int param0) BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const u8 param2) { - LocalMapObject * v0; + MapObject * v0; switch (param1->unk_00) { case 0: @@ -524,7 +524,7 @@ BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const return 1; } - v0 = Player_LocalMapObject(param0->playerAvatar); + v0 = Player_MapObject(param0->playerAvatar); if (LocalMapObj_IsAnimationSet(v0) == 1) { LocalMapObj_SetAnimationCode(v0, 0x49); @@ -539,7 +539,7 @@ BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const ov5_021D1744(1); ov5_021D4278(param0->unk_54, 2, 0, 1557); - v0 = Player_LocalMapObject(param0->playerAvatar); + v0 = Player_MapObject(param0->playerAvatar); if (LocalMapObj_IsAnimationSet(v0) == 1) { int v8; @@ -558,7 +558,7 @@ BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const (param1->unk_00)++; break; case 2: - v0 = Player_LocalMapObject(param0->playerAvatar); + v0 = Player_MapObject(param0->playerAvatar); if (LocalMapObj_IsAnimationSet(v0) == 1) { LocalMapObj_SetAnimationCode(v0, 0x4a); @@ -566,7 +566,7 @@ BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const } break; case 3: - v0 = Player_LocalMapObject(param0->playerAvatar); + v0 = Player_MapObject(param0->playerAvatar); if (LocalMapObj_IsAnimationSet(v0) == 1) { int v9; @@ -582,7 +582,7 @@ BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const } break; case 4: - v0 = Player_LocalMapObject(param0->playerAvatar); + v0 = Player_MapObject(param0->playerAvatar); if (LocalMapObj_CheckAnimationFinished(v0) == 1) { sub_020656AC(v0); @@ -609,7 +609,7 @@ BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const BOOL ov5_021D4A24 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const u8 param2) { - LocalMapObject * v0; + MapObject * v0; switch (param1->unk_00) { case 0: @@ -640,7 +640,7 @@ BOOL ov5_021D4A24 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const return 1; } - v0 = Player_LocalMapObject(param0->playerAvatar); + v0 = Player_MapObject(param0->playerAvatar); if (LocalMapObj_IsAnimationSet(v0) == 1) { LocalMapObj_SetAnimationCode(v0, 0x49); @@ -653,7 +653,7 @@ BOOL ov5_021D4A24 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const break; case 1: ov5_021D4278(param0->unk_54, 2, 0, 1557); - v0 = Player_LocalMapObject(param0->playerAvatar); + v0 = Player_MapObject(param0->playerAvatar); if (LocalMapObj_IsAnimationSet(v0) == 1) { int v8; @@ -672,7 +672,7 @@ BOOL ov5_021D4A24 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const (param1->unk_00)++; break; case 2: - v0 = Player_LocalMapObject(param0->playerAvatar); + v0 = Player_MapObject(param0->playerAvatar); if (LocalMapObj_IsAnimationSet(v0) == 1) { LocalMapObj_SetAnimationCode(v0, 0x4a); @@ -682,7 +682,7 @@ BOOL ov5_021D4A24 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const } break; case 3: - v0 = Player_LocalMapObject(param0->playerAvatar); + v0 = Player_MapObject(param0->playerAvatar); if (LocalMapObj_CheckAnimationFinished(v0) == 1) { sub_020656AC(v0); @@ -886,13 +886,13 @@ UnkStruct_ov5_021D4E00 * ov5_021D4E00 (void) BOOL ov5_021D4E10 (TaskManager * param0) { - LocalMapObject * v0; + MapObject * v0; FieldSystem * v1 = TaskManager_FieldSystem(param0); UnkStruct_ov5_021D4E00 * v2 = TaskManager_Environment(param0); switch (v2->unk_00) { case 0: - v0 = Player_LocalMapObject(v1->playerAvatar); + v0 = Player_MapObject(v1->playerAvatar); if (Player_Dir(v1->playerAvatar) == 1) { sub_02062D64(v0, 1); @@ -914,13 +914,13 @@ BOOL ov5_021D4E10 (TaskManager * param0) v2->unk_08 = 1; break; case 1: - v0 = Player_LocalMapObject(v1->playerAvatar); + v0 = Player_MapObject(v1->playerAvatar); sub_02062D64(v0, 0); LocalMapObj_SetAnimationCode(v0, 0xd); (v2->unk_00)++; break; case 2: - v0 = Player_LocalMapObject(v1->playerAvatar); + v0 = Player_MapObject(v1->playerAvatar); if (LocalMapObj_CheckAnimationFinished(v0) == 1) { sub_020656AC(v0); @@ -950,9 +950,9 @@ BOOL ov5_021D4F14 (TaskManager * param0) switch (v1->unk_00) { case 0: { - LocalMapObject * v2; + MapObject * v2; - v2 = Player_LocalMapObject(v0->playerAvatar); + v2 = Player_MapObject(v0->playerAvatar); sub_02062D64(v2, 1); @@ -1016,7 +1016,7 @@ BOOL ov5_021D4FA0 (TaskManager * param0) BOOL ov5_021D5020 (TaskManager * param0) { - LocalMapObject * v0; + MapObject * v0; FieldSystem * v1 = TaskManager_FieldSystem(param0); UnkStruct_ov5_021D4E00 * v2 = TaskManager_Environment(param0); @@ -1026,7 +1026,7 @@ BOOL ov5_021D5020 (TaskManager * param0) u8 v3; u8 v4; - v0 = Player_LocalMapObject(v1->playerAvatar); + v0 = Player_MapObject(v1->playerAvatar); v3 = Player_Dir(v1->playerAvatar); if (v3 == 1) { @@ -1067,13 +1067,13 @@ BOOL ov5_021D5020 (TaskManager * param0) } break; case 1: - v0 = Player_LocalMapObject(v1->playerAvatar); + v0 = Player_MapObject(v1->playerAvatar); sub_02062D64(v0, 0); LocalMapObj_SetAnimationCode(v0, 0xd); (v2->unk_00)++; break; case 2: - v0 = Player_LocalMapObject(v1->playerAvatar); + v0 = Player_MapObject(v1->playerAvatar); if (LocalMapObj_CheckAnimationFinished(v0) == 1) { sub_020656AC(v0); @@ -1097,7 +1097,7 @@ BOOL ov5_021D5020 (TaskManager * param0) BOOL ov5_021D5150 (TaskManager * param0) { - LocalMapObject * v0; + MapObject * v0; FieldSystem * v1 = TaskManager_FieldSystem(param0); UnkStruct_ov5_021D4E00 * v2 = TaskManager_Environment(param0); @@ -1107,7 +1107,7 @@ BOOL ov5_021D5150 (TaskManager * param0) u8 v3; u8 v4; - v0 = Player_LocalMapObject(v1->playerAvatar); + v0 = Player_MapObject(v1->playerAvatar); v3 = Player_Dir(v1->playerAvatar); if (v3 == 1) { @@ -1122,13 +1122,13 @@ BOOL ov5_021D5150 (TaskManager * param0) } break; case 1: - v0 = Player_LocalMapObject(v1->playerAvatar); + v0 = Player_MapObject(v1->playerAvatar); sub_02062D64(v0, 0); LocalMapObj_SetAnimationCode(v0, 0xd); (v2->unk_00)++; break; case 2: - v0 = Player_LocalMapObject(v1->playerAvatar); + v0 = Player_MapObject(v1->playerAvatar); if (LocalMapObj_CheckAnimationFinished(v0) == 1) { sub_020656AC(v0); diff --git a/src/overlay005/ov5_021DB888.c b/src/overlay005/ov5_021DB888.c index 2cdb5ceaec..9847a83ebf 100644 --- a/src/overlay005/ov5_021DB888.c +++ b/src/overlay005/ov5_021DB888.c @@ -36,7 +36,7 @@ typedef struct { FieldSystem * unk_04; UnkStruct_020507E4 * unk_08; const UnkStruct_ov5_021F8E48 * unk_0C; - LocalMapObject * unk_10[64]; + MapObject * unk_10[64]; u16 unk_110; u16 unk_112; u16 * unk_114; @@ -51,30 +51,30 @@ typedef struct { } UnkStruct_ov5_021DBC64; void ov5_021DB888(TaskManager * param0, StringTemplate * param1, u16 * param2); -u16 ov5_021DBD98(FieldSystem * param0, LocalMapObject * param1, u16 param2); +u16 ov5_021DBD98(FieldSystem * param0, MapObject * param1, u16 param2); BOOL ov5_021DBB94(FieldSystem * param0); static BOOL ov5_021DBB70(u32 param0); static BOOL ov5_021DB8D8(TaskManager * param0); static int ov5_021DBA58(UnkStruct_ov5_021DBA58 * param0); static void ov5_021DBA54(UnkStruct_ov5_021DBA58 * param0, u32 param1); static void ov5_021DBA7C(UnkStruct_ov5_021DBA58 * param0); -static void ov5_021DBC40(UnkStruct_ov5_021DBA58 * param0, LocalMapObject * param1, const UnkStruct_ov5_021F8E3C * param2); +static void ov5_021DBC40(UnkStruct_ov5_021DBA58 * param0, MapObject * param1, const UnkStruct_ov5_021F8E3C * param2); static void ov5_021DBC64(UnkStruct_ov5_021DBA58 * param0, SysTask * param1); static void ov5_021DBC94(SysTask * param0, void * param1); static BOOL ov5_021DBCD4(UnkStruct_ov5_021DBA58 * param0); static BOOL ov5_021DBCE0(UnkStruct_ov5_021DBA58 * param0); -static u16 ov5_021DBD88(LocalMapObject * param0); +static u16 ov5_021DBD88(MapObject * param0); static void ov5_021DBC08(FieldSystem * param0); static u16 ov5_021DBDDC(FieldSystem * param0, u16 param1); static u16 ov5_021DBDFC(FieldSystem * param0, u16 param1); static u16 ov5_021DBE48(FieldSystem * param0, u16 param1, u16 param2); static u16 ov5_021DBE70(u16 param0, u16 param1); static u16 ov5_021DBEA4(u16 param0, u16 param1); -static BOOL ov5_021DBEB8(LocalMapObject * param0); -static void ov5_021DBECC(LocalMapObject * param0, u16 param1); -void ov5_021DBED4(FieldSystem * param0, LocalMapObject * param1); +static BOOL ov5_021DBEB8(MapObject * param0); +static void ov5_021DBECC(MapObject * param0, u16 param1); +void ov5_021DBED4(FieldSystem * param0, MapObject * param1); static BOOL ov5_021DBF20(FieldSystem * param0); -static LocalMapObject * ov5_021DBF70(FieldSystem * param0, LocalMapObject * param1, int param2); +static MapObject * ov5_021DBF70(FieldSystem * param0, MapObject * param1, int param2); const UnkStruct_ov5_021F8E48 Unk_ov5_021F8E48[] = { { 0xE, 0xE, 0x0, 0x0, 0x0, 0x0 }, @@ -459,7 +459,7 @@ static void ov5_021DBA7C (UnkStruct_ov5_021DBA58 * param0) u32 v2; int v3, v4, v5, v6; int v7, v8, v9, v10; - LocalMapObject * v11; + MapObject * v11; u32 v12 = sub_0203A4B4(param0->unk_04); v6 = 0; @@ -560,7 +560,7 @@ BOOL ov5_021DBB94 (FieldSystem * param0) static void ov5_021DBC08 (FieldSystem * param0) { int v0; - LocalMapObject * v1; + MapObject * v1; u32 v2 = sub_0203A4B4(param0); for (v0 = 0; v0 < v2; v0++) { @@ -578,7 +578,7 @@ static void ov5_021DBC08 (FieldSystem * param0) return; } -static void ov5_021DBC40 (UnkStruct_ov5_021DBA58 * param0, LocalMapObject * param1, const UnkStruct_ov5_021F8E3C * param2) +static void ov5_021DBC40 (UnkStruct_ov5_021DBA58 * param0, MapObject * param1, const UnkStruct_ov5_021F8E3C * param2) { SysTask * v0; @@ -634,7 +634,7 @@ static BOOL ov5_021DBCD4 (UnkStruct_ov5_021DBA58 * param0) static BOOL ov5_021DBCE0 (UnkStruct_ov5_021DBA58 * param0) { UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_04->saveData); - LocalMapObject * v1; + MapObject * v1; u16 v2; int v3, v4; @@ -669,13 +669,13 @@ static BOOL ov5_021DBCE0 (UnkStruct_ov5_021DBA58 * param0) return v4; } -static u16 ov5_021DBD88 (LocalMapObject * param0) +static u16 ov5_021DBD88 (MapObject * param0) { u32 v0 = sub_02062960(param0); return sub_0203F254(v0); } -u16 ov5_021DBD98 (FieldSystem * param0, LocalMapObject * param1, u16 param2) +u16 ov5_021DBD98 (FieldSystem * param0, MapObject * param1, u16 param2) { u16 v0, v1, v2; @@ -771,7 +771,7 @@ static u16 ov5_021DBEA4 (u16 param0, u16 param1) return v0[param0].unk_00[param1]; } -static BOOL ov5_021DBEB8 (LocalMapObject * param0) +static BOOL ov5_021DBEB8 (MapObject * param0) { if (sub_02062948(param0) == 0x31) { return 1; @@ -780,15 +780,15 @@ static BOOL ov5_021DBEB8 (LocalMapObject * param0) return 0; } -static void ov5_021DBECC (LocalMapObject * param0, u16 param1) +static void ov5_021DBECC (MapObject * param0, u16 param1) { sub_020633A8(param0, param1); return; } -void ov5_021DBED4 (FieldSystem * param0, LocalMapObject * param1) +void ov5_021DBED4 (FieldSystem * param0, MapObject * param1) { - LocalMapObject * v0; + MapObject * v0; u32 v1; int v2; @@ -821,7 +821,7 @@ void ov5_021DBED4 (FieldSystem * param0, LocalMapObject * param1) static BOOL ov5_021DBF20 (FieldSystem * param0) { int v0, v1; - LocalMapObject * v2; + MapObject * v2; u32 v3 = sub_0203A4B4(param0); v1 = 0; @@ -848,9 +848,9 @@ static BOOL ov5_021DBF20 (FieldSystem * param0) } } -static LocalMapObject * ov5_021DBF70 (FieldSystem * param0, LocalMapObject * param1, int param2) +static MapObject * ov5_021DBF70 (FieldSystem * param0, MapObject * param1, int param2) { - LocalMapObject * v0; + MapObject * v0; u32 v1, v2, v3, v4; u32 v5 = sub_0203A4B4(param0); u16 v6 = sub_02062960(param1); diff --git a/src/overlay005/ov5_021DF440.c b/src/overlay005/ov5_021DF440.c index 71027e5cb1..e00be94702 100644 --- a/src/overlay005/ov5_021DF440.c +++ b/src/overlay005/ov5_021DF440.c @@ -225,7 +225,7 @@ FieldSystem * ov5_021DF574 (const UnkStruct_ov5_021DF47C * param0) return param0->unk_10; } -UnkStruct_ov5_021DF47C * ov5_021DF578 (const LocalMapObject * param0) +UnkStruct_ov5_021DF47C * ov5_021DF578 (const MapObject * param0) { FieldSystem * v0 = sub_02062C00(param0); return (UnkStruct_ov5_021DF47C *)v0->unk_40; diff --git a/src/overlay005/ov5_021DFB54.c b/src/overlay005/ov5_021DFB54.c index 0be22dd8ec..9cb67a0383 100644 --- a/src/overlay005/ov5_021DFB54.c +++ b/src/overlay005/ov5_021DFB54.c @@ -58,7 +58,7 @@ typedef struct { int unk_04; FieldSystem * unk_08; PlayerAvatar * unk_0C; - LocalMapObject * unk_10; + MapObject * unk_10; UnkStruct_ov9_0224F6EC * unk_14; } UnkStruct_ov5_021DFF88; @@ -69,7 +69,7 @@ typedef struct { UnkStruct_ov5_021E1050 unk_0C; FieldSystem * unk_1C; PlayerAvatar * unk_20; - LocalMapObject * unk_24; + MapObject * unk_24; UnkStruct_ov101_021D5D90 * unk_28; } UnkStruct_ov5_021E00B0; @@ -78,7 +78,7 @@ typedef struct { int unk_04; FieldSystem * unk_08; PlayerAvatar * unk_0C; - LocalMapObject * unk_10; + MapObject * unk_10; UnkStruct_ov101_021D5D90 * unk_14; } UnkStruct_ov5_021E0390; @@ -88,7 +88,7 @@ typedef struct { int unk_08; FieldSystem * unk_0C; PlayerAvatar * unk_10; - LocalMapObject * unk_14; + MapObject * unk_14; UnkStruct_ov101_021D5D90 * unk_18; UnkStruct_ov5_021E1050 unk_1C; UnkStruct_ov5_021D1BEC * unk_2C; @@ -106,7 +106,7 @@ typedef struct { VecFx32 unk_28; FieldSystem * unk_34; PlayerAvatar * unk_38; - LocalMapObject * unk_3C; + MapObject * unk_3C; UnkStruct_ov5_021E1050 unk_40; UnkStruct_ov5_021D1BEC * unk_50; } UnkStruct_ov5_021F9B10; @@ -121,7 +121,7 @@ typedef struct { typedef struct { FieldSystem * unk_00; PlayerAvatar * unk_04; - LocalMapObject * unk_08; + MapObject * unk_08; int unk_0C; int unk_10; SysTask * unk_14; @@ -137,7 +137,7 @@ typedef struct { static int ov5_021DFE68(FieldSystem * param0, PlayerAvatar * param1, int param2, int param3); static int ov5_021DFEF4(FieldSystem * param0, PlayerAvatar * param1, int param2, int param3); static int ov5_021DFF1C(FieldSystem * param0, PlayerAvatar * param1, int param2, int param3); -static void ov5_021DFF88(int param0, FieldSystem * param1, PlayerAvatar * param2, LocalMapObject * param3); +static void ov5_021DFF88(int param0, FieldSystem * param1, PlayerAvatar * param2, MapObject * param3); static BOOL ov5_021DFFBC(TaskManager * param0); static void ov5_021E00B0(FieldSystem * param0, int param1, const UnkStruct_ov5_021E1050 * param2); static BOOL ov5_021E0160(TaskManager * param0); @@ -162,7 +162,7 @@ static void ov5_021E103C(FieldSystem * param0, UnkStruct_ov5_021E1050 * param1); static int ov5_021E1050(UnkStruct_ov5_021E1050 * param0); static void ov5_021E106C(PlayerAvatar * param0, int param1); static void ov5_021E10C0(void * param0, const UnkStruct_020216E0 * param1); -static LocalMapObject * ov5_021E10D4(PlayerAvatar * param0, int param1); +static MapObject * ov5_021E10D4(PlayerAvatar * param0, int param1); static void * ov5_021E1110(int param0); static void ov5_021E1134(void * param0); static Pokemon * ov5_021E1140(FieldSystem * param0, int param1); @@ -203,7 +203,7 @@ static void ov5_021DFB90 (PlayerAvatar * param0) if (sub_0205F108(param0) != 0) { v1 = 0x18; } else { - LocalMapObject * v2 = Player_LocalMapObject(param0); + MapObject * v2 = Player_MapObject(param0); FieldSystem * v3 = sub_02062C00(v2); if (sub_02071CB4(v3, 2) == 1) { @@ -254,7 +254,7 @@ static void ov5_021DFBF4 (PlayerAvatar * param0) static void ov5_021DFC3C (PlayerAvatar * param0) { int v0, v1; - LocalMapObject * v2 = Player_LocalMapObject(param0); + MapObject * v2 = Player_MapObject(param0); FieldSystem * v3 = sub_02062C00(v2); int v4 = sub_0205F108(param0); UnkStruct_ov101_021D5D90 * v5 = sub_0205EC04(param0); @@ -317,7 +317,7 @@ static void ov5_021DFD28 (PlayerAvatar * param0) if (sub_0205F108(param0) != 0) { v1 = 0x1b; } else { - LocalMapObject * v2 = Player_LocalMapObject(param0); + MapObject * v2 = Player_MapObject(param0); FieldSystem * v3 = sub_02062C00(v2); if (sub_02071CB4(v3, 2) == 1) { @@ -337,7 +337,7 @@ static void ov5_021DFD68 (PlayerAvatar * param0) if (sub_0205F108(param0) != 0) { v1 = 0x1a; } else { - LocalMapObject * v2 = Player_LocalMapObject(param0); + MapObject * v2 = Player_MapObject(param0); FieldSystem * v3 = sub_02062C00(v2); if (sub_02071CB4(v3, 2) == 1) { @@ -381,10 +381,10 @@ static void(*const Unk_ov5_021F9B74[10])(PlayerAvatar *) = { int ov5_021DFDE0 (FieldSystem * param0, PlayerAvatar * param1, int param2, int param3) { { - LocalMapObject * v0; + MapObject * v0; GF_ASSERT(param1 != NULL); - v0 = Player_LocalMapObject(param1); + v0 = Player_MapObject(param1); GF_ASSERT(v0 != NULL); } @@ -466,7 +466,7 @@ static int ov5_021DFF1C (FieldSystem * param0, PlayerAvatar * param1, int param2 } { - LocalMapObject * v0 = ov5_021E10D4(param1, param2); + MapObject * v0 = ov5_021E10D4(param1, param2); if (v0 == NULL) { return 0; @@ -501,7 +501,7 @@ static int ov5_021DFF1C (FieldSystem * param0, PlayerAvatar * param1, int param2 } } -static void ov5_021DFF88 (int param0, FieldSystem * param1, PlayerAvatar * param2, LocalMapObject * param3) +static void ov5_021DFF88 (int param0, FieldSystem * param1, PlayerAvatar * param2, MapObject * param3) { UnkStruct_ov5_021DFF88 * v0 = ov5_021E1110((sizeof(UnkStruct_ov5_021DFF88))); @@ -517,8 +517,8 @@ static void ov5_021DFF88 (int param0, FieldSystem * param1, PlayerAvatar * param static BOOL ov5_021DFFBC (TaskManager * param0) { UnkStruct_ov5_021DFF88 * v0 = TaskManager_Environment(param0); - LocalMapObject * v1 = Player_LocalMapObject(v0->unk_0C); - LocalMapObject * v2 = v0->unk_10; + MapObject * v1 = Player_MapObject(v0->unk_0C); + MapObject * v2 = v0->unk_10; switch (v0->unk_00) { case 0: @@ -586,7 +586,7 @@ static void ov5_021E00B0 (FieldSystem * param0, int param1, const UnkStruct_ov5_ v0->unk_04 = param1; v0->unk_1C = param0; v0->unk_20 = param0->playerAvatar; - v0->unk_24 = Player_LocalMapObject(v0->unk_20); + v0->unk_24 = Player_MapObject(v0->unk_20); v0->unk_0C = *param2; sub_02050944(param0->unk_10, ov5_021E0160, v0); @@ -604,7 +604,7 @@ void ov5_021E00EC (TaskManager * param0, int param1, int param2) int ov5_021E0118 (PlayerAvatar * param0, u32 param1, u32 param2) { - LocalMapObject * v0 = Player_LocalMapObject(param0); + MapObject * v0 = Player_MapObject(param0); if (sub_0205DB58(param2) == 1) { if ((sub_0205DEFC(param1) == 1) || (sub_0205DEF0(param1) == 1)) { @@ -716,7 +716,7 @@ static int ov5_021E032C (FieldSystem * param0, PlayerAvatar * param1, int param2 { u32 v0; - LocalMapObject * v1 = Player_LocalMapObject(param1); + MapObject * v1 = Player_MapObject(param1); if (sub_0205F158(param1) == 0) { v0 = sub_02060B7C(param1, v1, param2); @@ -746,7 +746,7 @@ static void ov5_021E0390 (int param0, FieldSystem * param1, PlayerAvatar * param v0->unk_04 = param0; v0->unk_08 = param1; v0->unk_0C = param2; - v0->unk_10 = Player_LocalMapObject(param2); + v0->unk_10 = Player_MapObject(param2); v0->unk_14 = sub_0205EC04(param2); sub_02050904(param1, ov5_021E03C8, v0); @@ -828,7 +828,7 @@ static int ov5_021E04EC (FieldSystem * param0, PlayerAvatar * param1, int param2 } { - LocalMapObject * v0 = Player_LocalMapObject(param1); + MapObject * v0 = Player_MapObject(param1); u8 v1 = sub_02062BE8(v0); if ((sub_0205DCF0(v1) != 1) && (sub_0205DD0C(v1) != 1)) { @@ -854,7 +854,7 @@ static void ov5_021E0534 (FieldSystem * param0, PlayerAvatar * param1) static BOOL ov5_021E0560 (TaskManager * param0) { UnkStruct_ov5_021E0534 * v0 = TaskManager_Environment(param0); - LocalMapObject * v1 = Player_LocalMapObject(v0->unk_0C); + MapObject * v1 = Player_MapObject(v0->unk_0C); switch (v0->unk_00) { case 0: @@ -922,7 +922,7 @@ static BOOL ov5_021E0560 (TaskManager * param0) static int ov5_021E067C (FieldSystem * param0, PlayerAvatar * param1, int param2) { - LocalMapObject * v0 = Player_LocalMapObject(param1); + MapObject * v0 = Player_MapObject(param1); if (LocalMapObj_IsAnimationSet(v0) == 0) { return 0; @@ -943,7 +943,7 @@ static int ov5_021E06A8 (FieldSystem * param0, PlayerAvatar * param1) { int v0 = sub_0205EA94(param1); - LocalMapObject * v1 = ov5_021E10D4(param1, v0); + MapObject * v1 = ov5_021E10D4(param1, v0); if (v1 == NULL) { return 0; @@ -958,7 +958,7 @@ static int ov5_021E06A8 (FieldSystem * param0, PlayerAvatar * param1) } ov5_021EC7F0(v1); - LocalMapObj_Delete(v1); + MapObject_Delete(v1); Sound_PlayEffect(1627); } @@ -972,7 +972,7 @@ static void ov5_021E06F8 (FieldSystem * param0, int param1, const UnkStruct_ov5_ v0->unk_04 = param1; v0->unk_0C = param0; v0->unk_10 = param0->playerAvatar; - v0->unk_14 = Player_LocalMapObject(v0->unk_10); + v0->unk_14 = Player_MapObject(v0->unk_10); v0->unk_1C = *param2; sub_02050944(param0->unk_10, ov5_021E07A0, v0); @@ -1149,7 +1149,7 @@ static UnkStruct_ov5_021F9B10 * ov5_021E0948 (FieldSystem * param0, int param1, v0->unk_04 = param1; v0->unk_34 = param0; v0->unk_38 = param0->playerAvatar; - v0->unk_3C = Player_LocalMapObject(param0->playerAvatar); + v0->unk_3C = Player_MapObject(param0->playerAvatar); if (param2 != NULL) { v0->unk_40 = *param2; @@ -1524,7 +1524,7 @@ static void ov5_021E0DE0 (FieldSystem * param0) v0->unk_00 = param0; v0->unk_04 = param0->playerAvatar; - v0->unk_08 = Player_LocalMapObject(v0->unk_04); + v0->unk_08 = Player_MapObject(v0->unk_04); v0->unk_10 = sub_0205EB98(v0->unk_04); sub_02050944(param0->unk_10, ov5_021E0E10, v0); @@ -1564,7 +1564,7 @@ static BOOL ov5_021E0E10 (TaskManager * param0) void ov5_021E0E94 (PlayerAvatar * param0) { - LocalMapObject * v0 = Player_LocalMapObject(param0); + MapObject * v0 = Player_MapObject(param0); if (sub_02062DFC(v0) == 0) { return; @@ -1597,7 +1597,7 @@ void ov5_021E0E94 (PlayerAvatar * param0) void ov5_021E0EEC (PlayerAvatar * param0) { - LocalMapObject * v0 = Player_LocalMapObject(param0); + MapObject * v0 = Player_MapObject(param0); if (sub_02062DFC(v0) == 0) { return; @@ -1639,7 +1639,7 @@ static SysTask * ov5_021E0F54 (FieldSystem * param0, u32 param1) { SysTask * v2; - LocalMapObject * v3 = Player_LocalMapObject(v0); + MapObject * v3 = Player_MapObject(v0); UnkStruct_ov5_021E0FF0 * v4 = Heap_AllocFromHeapAtEnd(4, (sizeof(UnkStruct_ov5_021E0FF0))); v4->unk_00 = 0; @@ -1678,7 +1678,7 @@ static void ov5_021E0FC0 (SysTask * param0) static void ov5_021E0FF0 (SysTask * param0, void * param1) { UnkStruct_ov5_021E0FF0 * v0 = param1; - LocalMapObject * v1 = Player_LocalMapObject(v0->unk_0C); + MapObject * v1 = Player_MapObject(v0->unk_0C); sub_02062B68(v1); } @@ -1727,7 +1727,7 @@ static int ov5_021E1050 (UnkStruct_ov5_021E1050 * param0) static void ov5_021E106C (PlayerAvatar * param0, int param1) { - LocalMapObject * v0 = Player_LocalMapObject(param0); + MapObject * v0 = Player_MapObject(param0); if (sub_0205F108(param0) == 0) { ov5_021EE3FC(v0, param1, NULL, NULL); @@ -1749,18 +1749,18 @@ static void ov5_021E106C (PlayerAvatar * param0, int param1) static void ov5_021E10C0 (void * param0, const UnkStruct_020216E0 * param1) { PlayerAvatar * v0 = param0; - LocalMapObject * v1 = Player_LocalMapObject(v0); + MapObject * v1 = Player_MapObject(v0); FieldSystem * v2 = sub_02062C00(v1); ov9_0224A564(v2, param1); } -static LocalMapObject * ov5_021E10D4 (PlayerAvatar * param0, int param1) +static MapObject * ov5_021E10D4 (PlayerAvatar * param0, int param1) { int v0 = Player_XPos(param0) + sub_0206419C(param1); int v1 = Player_ZPos(param0) + sub_020641A8(param1); - const MapObjectManager * v2 = sub_02062A40(Player_LocalMapObject(param0)); - LocalMapObject * v3 = sub_0206326C(v2, v0, v1, 0); + const MapObjectManager * v2 = sub_02062A40(Player_MapObject(param0)); + MapObject * v3 = sub_0206326C(v2, v0, v1, 0); return v3; } diff --git a/src/overlay005/ov5_021E1154.c b/src/overlay005/ov5_021E1154.c index 0469846ea9..3208ca4774 100644 --- a/src/overlay005/ov5_021E1154.c +++ b/src/overlay005/ov5_021E1154.c @@ -23,7 +23,7 @@ typedef struct { int unk_08; FieldSystem * unk_0C; PlayerAvatar * unk_10; - LocalMapObject * unk_14; + MapObject * unk_14; } UnkStruct_ov5_021E11B0; static void ov5_021E11B0(FieldSystem * param0, PlayerAvatar * param1, int param2); @@ -33,7 +33,7 @@ static void ov5_021E1350(void * param0); int ov5_021E1154 (FieldSystem * param0, PlayerAvatar * param1, int param2) { - LocalMapObject * v0 = Player_LocalMapObject(param1); + MapObject * v0 = Player_MapObject(param1); u8 v1 = sub_02062BE8(v0); int v2; @@ -84,12 +84,12 @@ static int ov5_021E11E0 (int param0) static BOOL ov5_021E120C (TaskManager * param0) { UnkStruct_ov5_021E11B0 * v0 = TaskManager_Environment(param0); - LocalMapObject * v1 = Player_LocalMapObject(v0->unk_10); + MapObject * v1 = Player_MapObject(v0->unk_10); u8 v2 = sub_02062BE8(v1); switch (v0->unk_08) { case 0: - sub_020628BC(v1, (1 << 8)); + MapObject_SetFlagOn(v1, (1 << 8)); v0->unk_08++; break; case 1: @@ -136,8 +136,8 @@ static BOOL ov5_021E120C (TaskManager * param0) if (v4 == 0) { v0->unk_08 = 1; } else { - sub_020628C4(v1, (1 << 7)); - sub_020628C4(v1, (1 << 8)); + MapObject_SetFlagOff(v1, (1 << 7)); + MapObject_SetFlagOff(v1, (1 << 8)); Player_SetDir(v0->unk_10, v0->unk_00); ov5_021E1350(v0); sub_020057A4(1624, 0); diff --git a/src/overlay005/ov5_021E135C.c b/src/overlay005/ov5_021E135C.c index 3e7e4e6a88..9163913d88 100644 --- a/src/overlay005/ov5_021E135C.c +++ b/src/overlay005/ov5_021E135C.c @@ -48,7 +48,7 @@ static void ov5_021E135C (UnkStruct_ov5_021E135C * param0) static void ov5_021E139C (SysTask * param0, void * param1) { UnkStruct_ov5_021E135C * v0 = param1; - LocalMapObject * v1 = Player_LocalMapObject(v0->unk_00->playerAvatar); + MapObject * v1 = Player_MapObject(v0->unk_00->playerAvatar); VecFx32 v2; switch (v0->unk_08) { @@ -81,7 +81,7 @@ static void ov5_021E139C (SysTask * param0, void * param1) static void ov5_021E1470 (SysTask * param0, void * param1) { UnkStruct_ov5_021E135C * v0 = param1; - LocalMapObject * v1 = Player_LocalMapObject(v0->unk_00->playerAvatar); + MapObject * v1 = Player_MapObject(v0->unk_00->playerAvatar); VecFx32 v2; int v3; diff --git a/src/overlay005/ov5_021EB1A0.c b/src/overlay005/ov5_021EB1A0.c index 5d56bc4a3f..bd476f9281 100644 --- a/src/overlay005/ov5_021EB1A0.c +++ b/src/overlay005/ov5_021EB1A0.c @@ -69,39 +69,39 @@ typedef struct { UnkStruct_ov5_021ED01C unk_0C; } UnkStruct_ov5_021EC938; -void ov5_021EB2EC(LocalMapObject * param0); -void ov5_021EB314(LocalMapObject * param0); -void ov5_021EB328(LocalMapObject * param0); -void ov5_021EB354(LocalMapObject * param0); -void ov5_021EB398(LocalMapObject * param0); -void ov5_021EB40C(LocalMapObject * param0); -static void ov5_021EB478(LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3); -static void ov5_021EB4AC(LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3); -static void ov5_021EB4E8(LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3); -static void ov5_021EB524(LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3); -static void ov5_021EB560(LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3); -static void ov5_021EB59C(LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3); -static void ov5_021EB620(LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3); -static void ov5_021EC068(LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3); -static void ov5_021EC0E4(LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3); -void ov5_021EC734(LocalMapObject * param0); -void ov5_021EC75C(LocalMapObject * param0); -void ov5_021EC760(LocalMapObject * param0); -void ov5_021EC778(LocalMapObject * param0); -void ov5_021EC790(LocalMapObject * param0); +void ov5_021EB2EC(MapObject * param0); +void ov5_021EB314(MapObject * param0); +void ov5_021EB328(MapObject * param0); +void ov5_021EB354(MapObject * param0); +void ov5_021EB398(MapObject * param0); +void ov5_021EB40C(MapObject * param0); +static void ov5_021EB478(MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3); +static void ov5_021EB4AC(MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3); +static void ov5_021EB4E8(MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3); +static void ov5_021EB524(MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3); +static void ov5_021EB560(MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3); +static void ov5_021EB59C(MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3); +static void ov5_021EB620(MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3); +static void ov5_021EC068(MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3); +static void ov5_021EC0E4(MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3); +void ov5_021EC734(MapObject * param0); +void ov5_021EC75C(MapObject * param0); +void ov5_021EC760(MapObject * param0); +void ov5_021EC778(MapObject * param0); +void ov5_021EC790(MapObject * param0); static void ov5_021EC638(UnkStruct_020216E0 * param0, int param1); static void ov5_021EC668(UnkStruct_020216E0 * param0); static void ov5_021EC674(UnkStruct_020216E0 * param0, int param1, int param2); static void ov5_021EC69C(UnkStruct_020216E0 * param0, int param1); -static void ov5_021EC6C0(LocalMapObject * param0, UnkStruct_020216E0 * param1); -static void ov5_021EC374(LocalMapObject * param0, UnkStruct_020216E0 * param1, int param2); +static void ov5_021EC6C0(MapObject * param0, UnkStruct_020216E0 * param1); +static void ov5_021EC374(MapObject * param0, UnkStruct_020216E0 * param1, int param2); -void(*const Unk_ov5_021FF3D4[])(LocalMapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EB2EC *, int); -void(*const Unk_ov5_021FF420[])(LocalMapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EB2EC *, int); -void(*const Unk_ov5_021FF3F8[])(LocalMapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int); -static void(*const Unk_ov5_021FF448[11])(LocalMapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int); +void(*const Unk_ov5_021FF3D4[])(MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EB2EC *, int); +void(*const Unk_ov5_021FF420[])(MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EB2EC *, int); +void(*const Unk_ov5_021FF3F8[])(MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int); +static void(*const Unk_ov5_021FF448[11])(MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int); -UnkStruct_020216E0 * ov5_021EB1A0 (LocalMapObject * param0) +UnkStruct_020216E0 * ov5_021EB1A0 (MapObject * param0) { int v0 = sub_02062920(param0); @@ -186,7 +186,7 @@ UnkStruct_020216E0 * ov5_021EB1A0 (LocalMapObject * param0) return NULL; } -void ov5_021EB2EC (LocalMapObject * param0) +void ov5_021EB2EC (MapObject * param0) { UnkStruct_ov5_021EB2EC * v0; @@ -200,7 +200,7 @@ void ov5_021EB2EC (LocalMapObject * param0) } } -void ov5_021EB314 (LocalMapObject * param0) +void ov5_021EB314 (MapObject * param0) { UnkStruct_ov5_021EB2EC * v0; @@ -208,7 +208,7 @@ void ov5_021EB314 (LocalMapObject * param0) ov5_021ECFA4(param0, &v0->unk_04); } -void ov5_021EB328 (LocalMapObject * param0) +void ov5_021EB328 (MapObject * param0) { UnkStruct_ov5_021EB2EC * v0; @@ -219,10 +219,10 @@ void ov5_021EB328 (LocalMapObject * param0) } ov5_021ECFA4(param0, &v0->unk_04); - sub_020628BC(param0, (1 << 21)); + MapObject_SetFlagOn(param0, (1 << 21)); } -void ov5_021EB354 (LocalMapObject * param0) +void ov5_021EB354 (MapObject * param0) { int v0; UnkStruct_ov5_021EB2EC * v1; @@ -241,11 +241,11 @@ void ov5_021EB354 (LocalMapObject * param0) ov5_021ED03C(v1->unk_04, &v1->unk_08); ov5_021EDEB4(param0, v1->unk_04); - sub_020628C4(param0, (1 << 21)); + MapObject_SetFlagOff(param0, (1 << 21)); } } -void ov5_021EB398 (LocalMapObject * param0) +void ov5_021EB398 (MapObject * param0) { int v0, v1; UnkStruct_ov5_021EB2EC * v2 = sub_02062AF0(param0); @@ -274,7 +274,7 @@ void ov5_021EB398 (LocalMapObject * param0) ov5_021EC6C0(param0, v3); } -void ov5_021EB40C (LocalMapObject * param0) +void ov5_021EB40C (MapObject * param0) { int v0, v1; UnkStruct_ov5_021EB2EC * v2; @@ -296,7 +296,7 @@ void ov5_021EB40C (LocalMapObject * param0) ov5_021EC6C0(param0, v3); } -void ov5_021EB438 (LocalMapObject * param0) +void ov5_021EB438 (MapObject * param0) { int v0, v1; UnkStruct_ov5_021EB2EC * v2; @@ -322,7 +322,7 @@ void ov5_021EB438 (LocalMapObject * param0) ov5_021EC6C0(param0, v3); } -static void ov5_021EB478 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) +static void ov5_021EB478 (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) { if (param3 != param2->unk_02) { int v0 = ov5_021EDF18(param3); @@ -336,7 +336,7 @@ static void ov5_021EB478 (LocalMapObject * param0, UnkStruct_020216E0 * param1, sub_02021368(param1, 0); } -static void ov5_021EB4AC (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) +static void ov5_021EB4AC (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) { if (param3 != param2->unk_02) { int v0 = ov5_021EDF18(param3); @@ -350,7 +350,7 @@ static void ov5_021EB4AC (LocalMapObject * param0, UnkStruct_020216E0 * param1, } } -static void ov5_021EB4E8 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) +static void ov5_021EB4E8 (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) { if (param3 != param2->unk_02) { int v0 = ov5_021EDF18(param3); @@ -364,7 +364,7 @@ static void ov5_021EB4E8 (LocalMapObject * param0, UnkStruct_020216E0 * param1, } } -static void ov5_021EB524 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) +static void ov5_021EB524 (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) { if (param3 != param2->unk_02) { int v0 = ov5_021EDF18(param3); @@ -378,7 +378,7 @@ static void ov5_021EB524 (LocalMapObject * param0, UnkStruct_020216E0 * param1, } } -static void ov5_021EB560 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) +static void ov5_021EB560 (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) { if (param3 != param2->unk_02) { int v0 = ov5_021EDF18(param3); @@ -392,7 +392,7 @@ static void ov5_021EB560 (LocalMapObject * param0, UnkStruct_020216E0 * param1, } } -static void ov5_021EB59C (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) +static void ov5_021EB59C (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) { if (param3 != param2->unk_02) { int v0 = ov5_021EDF18(param3); @@ -427,7 +427,7 @@ static void ov5_021EB59C (LocalMapObject * param0, UnkStruct_020216E0 * param1, } } -static void ov5_021EB620 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) +static void ov5_021EB620 (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) { if (param3 != param2->unk_02) { int v0 = ov5_021EDF18(param3); @@ -459,7 +459,7 @@ static void ov5_021EB620 (LocalMapObject * param0, UnkStruct_020216E0 * param1, } } -static void ov5_021EB69C (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) +static void ov5_021EB69C (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) { if (param3 != param2->unk_02) { int v0 = ov5_021EDF18(param3); @@ -496,7 +496,7 @@ static void ov5_021EB69C (LocalMapObject * param0, UnkStruct_020216E0 * param1, } static void(*const Unk_ov5_021FF3D4[])( - LocalMapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EB2EC *, int) = { + MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EB2EC *, int) = { ov5_021EB478, ov5_021EB4AC, ov5_021EB4AC, @@ -508,7 +508,7 @@ static void(*const Unk_ov5_021FF3D4[])( ov5_021EB69C }; -void ov5_021EB720 (LocalMapObject * param0) +void ov5_021EB720 (MapObject * param0) { int v0, v1; UnkStruct_ov5_021EB2EC * v2 = sub_02062AF0(param0); @@ -538,7 +538,7 @@ void ov5_021EB720 (LocalMapObject * param0) ov5_021EC6C0(param0, v3); } -static void ov5_021EB794 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) +static void ov5_021EB794 (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) { if ((param3 != param2->unk_02) || (param2->unk_03 == 0x9)) { int v0 = ov5_021EDF18(param3); @@ -552,7 +552,7 @@ static void ov5_021EB794 (LocalMapObject * param0, UnkStruct_020216E0 * param1, sub_02021368(param1, 0); } -static void ov5_021EB7D0 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) +static void ov5_021EB7D0 (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) { if (param2->unk_03 != 0x9) { sub_02021344(param1, 4); @@ -562,7 +562,7 @@ static void ov5_021EB7D0 (LocalMapObject * param0, UnkStruct_020216E0 * param1, sub_02021368(param1, (FX32_ONE)); } -static void(*const Unk_ov5_021FF420[])(LocalMapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EB2EC *, int) = { +static void(*const Unk_ov5_021FF420[])(MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EB2EC *, int) = { ov5_021EB794, ov5_021EB4AC, ov5_021EB4AC, @@ -575,7 +575,7 @@ static void(*const Unk_ov5_021FF420[])(LocalMapObject *, UnkStruct_020216E0 *, U ov5_021EB7D0 }; -void ov5_021EB7F8 (LocalMapObject * param0) +void ov5_021EB7F8 (MapObject * param0) { UnkStruct_ov5_021EB7F8 * v0; @@ -591,7 +591,7 @@ void ov5_021EB7F8 (LocalMapObject * param0) } } -void ov5_021EB834 (LocalMapObject * param0) +void ov5_021EB834 (MapObject * param0) { UnkStruct_ov5_021EB7F8 * v0; @@ -599,7 +599,7 @@ void ov5_021EB834 (LocalMapObject * param0) ov5_021ECFA4(param0, &v0->unk_04); } -void ov5_021EB848 (LocalMapObject * param0) +void ov5_021EB848 (MapObject * param0) { UnkStruct_ov5_021EB7F8 * v0; @@ -610,10 +610,10 @@ void ov5_021EB848 (LocalMapObject * param0) } ov5_021ECFA4(param0, &v0->unk_04); - sub_020628BC(param0, (1 << 21)); + MapObject_SetFlagOn(param0, (1 << 21)); } -void ov5_021EB874 (LocalMapObject * param0) +void ov5_021EB874 (MapObject * param0) { int v0; UnkStruct_ov5_021EB7F8 * v1; @@ -631,11 +631,11 @@ void ov5_021EB874 (LocalMapObject * param0) if (v1->unk_04 != NULL) { ov5_021ED03C(v1->unk_04, &v1->unk_08); ov5_021EDEB4(param0, v1->unk_04); - sub_020628C4(param0, (1 << 21)); + MapObject_SetFlagOff(param0, (1 << 21)); } } -void ov5_021EB8B8 (LocalMapObject * param0) +void ov5_021EB8B8 (MapObject * param0) { int v0, v1; UnkStruct_ov5_021EB7F8 * v2 = sub_02062AF0(param0); @@ -674,7 +674,7 @@ void ov5_021EB8B8 (LocalMapObject * param0) ov5_021EC6C0(param0, v3); } -void ov5_021EB944 (LocalMapObject * param0) +void ov5_021EB944 (MapObject * param0) { int v0, v1; UnkStruct_ov5_021EB2EC * v2 = sub_02062AF0(param0); @@ -741,7 +741,7 @@ void ov5_021EB944 (LocalMapObject * param0) ov5_021EC6C0(param0, v3); } -void ov5_021EBA0C (LocalMapObject * param0) +void ov5_021EBA0C (MapObject * param0) { UnkStruct_ov5_021EBA0C * v0; @@ -755,7 +755,7 @@ void ov5_021EBA0C (LocalMapObject * param0) } } -void ov5_021EBA34 (LocalMapObject * param0) +void ov5_021EBA34 (MapObject * param0) { UnkStruct_ov5_021EBA0C * v0; VecFx32 v1 = {0, 0, 0}; @@ -766,7 +766,7 @@ void ov5_021EBA34 (LocalMapObject * param0) sub_02063088(param0, &v1); } -void ov5_021EBA60 (LocalMapObject * param0) +void ov5_021EBA60 (MapObject * param0) { UnkStruct_ov5_021EBA0C * v0; @@ -777,10 +777,10 @@ void ov5_021EBA60 (LocalMapObject * param0) } ov5_021ECFA4(param0, &v0->unk_04); - sub_020628BC(param0, (1 << 21)); + MapObject_SetFlagOn(param0, (1 << 21)); } -void ov5_021EBA8C (LocalMapObject * param0) +void ov5_021EBA8C (MapObject * param0) { int v0; UnkStruct_ov5_021EBA0C * v1; @@ -798,11 +798,11 @@ void ov5_021EBA8C (LocalMapObject * param0) if (v1->unk_04 != NULL) { ov5_021ED03C(v1->unk_04, &v1->unk_08); ov5_021EDEB4(param0, v1->unk_04); - sub_020628C4(param0, (1 << 21)); + MapObject_SetFlagOff(param0, (1 << 21)); } } -void ov5_021EBAD0 (LocalMapObject * param0) +void ov5_021EBAD0 (MapObject * param0) { int v0, v1; UnkStruct_ov5_021EBA0C * v2 = sub_02062AF0(param0); @@ -831,7 +831,7 @@ void ov5_021EBAD0 (LocalMapObject * param0) ov5_021EC6C0(param0, v3); } -static void ov5_021EBB44 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EBB44 (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) { if (param3 != param2->unk_00) { int v0 = ov5_021EDF18(param3); @@ -849,7 +849,7 @@ static void ov5_021EBB44 (LocalMapObject * param0, UnkStruct_020216E0 * param1, } } -static void ov5_021EBBB4 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EBBB4 (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) { int v0; @@ -870,7 +870,7 @@ static void ov5_021EBBB4 (LocalMapObject * param0, UnkStruct_020216E0 * param1, } } -static void ov5_021EBC28 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EBC28 (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) { int v0; @@ -887,7 +887,7 @@ static void ov5_021EBC28 (LocalMapObject * param0, UnkStruct_020216E0 * param1, } } -static void ov5_021EBC7C (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EBC7C (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) { if (param3 != param2->unk_00) { int v0 = ov5_021EDF18(param3); @@ -903,7 +903,7 @@ static void ov5_021EBC7C (LocalMapObject * param0, UnkStruct_020216E0 * param1, } } -static void ov5_021EBCD0 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EBCD0 (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) { if (param3 != param2->unk_00) { int v0 = ov5_021EDF18(param3); @@ -919,7 +919,7 @@ static void ov5_021EBCD0 (LocalMapObject * param0, UnkStruct_020216E0 * param1, } } -static void ov5_021EBD24 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EBD24 (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) { if (param3 != param2->unk_00) { int v0 = ov5_021EDF18(param3); @@ -955,7 +955,7 @@ static void ov5_021EBD24 (LocalMapObject * param0, UnkStruct_020216E0 * param1, } } -static void ov5_021EBDC4 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EBDC4 (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) { if (param3 != param2->unk_00) { int v0 = ov5_021EDF18(param3); @@ -988,7 +988,7 @@ static void ov5_021EBDC4 (LocalMapObject * param0, UnkStruct_020216E0 * param1, } } -static void ov5_021EBE5C (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EBE5C (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) { if (param3 != param2->unk_00) { int v0 = ov5_021EDF18(param3); @@ -1025,7 +1025,7 @@ static void ov5_021EBE5C (LocalMapObject * param0, UnkStruct_020216E0 * param1, } } -static void ov5_021EBEFC (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EBEFC (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) { int v0; @@ -1044,7 +1044,7 @@ static void ov5_021EBEFC (LocalMapObject * param0, UnkStruct_020216E0 * param1, } static void(*const Unk_ov5_021FF3F8[])( - LocalMapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int) = { + MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int) = { ov5_021EBB44, ov5_021EBBB4, ov5_021EBBB4, @@ -1057,7 +1057,7 @@ static void(*const Unk_ov5_021FF3F8[])( ov5_021EBEFC }; -void ov5_021EBF50 (LocalMapObject * param0) +void ov5_021EBF50 (MapObject * param0) { int v0, v1; UnkStruct_ov5_021EBA0C * v2 = sub_02062AF0(param0); @@ -1091,7 +1091,7 @@ void ov5_021EBF50 (LocalMapObject * param0) ov5_021EC6C0(param0, v3); } -static void ov5_021EBFDC (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EBFDC (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) { int v0[4] = {6, 7, 8, 9}; int v1 = v0[param3]; @@ -1111,7 +1111,7 @@ static void ov5_021EBFDC (LocalMapObject * param0, UnkStruct_020216E0 * param1, } } -static void ov5_021EC068 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EC068 (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) { int v0; @@ -1133,7 +1133,7 @@ static void ov5_021EC068 (LocalMapObject * param0, UnkStruct_020216E0 * param1, } } -static void ov5_021EC0E4 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EC0E4 (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) { int v0; @@ -1156,7 +1156,7 @@ static void ov5_021EC0E4 (LocalMapObject * param0, UnkStruct_020216E0 * param1, } static void(*const Unk_ov5_021FF448[11])( - LocalMapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int) = { + MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int) = { ov5_021EBFDC, ov5_021EBBB4, ov5_021EBBB4, @@ -1170,7 +1170,7 @@ static void(*const Unk_ov5_021FF448[11])( ov5_021EC0E4 }; -void(*const Unk_ov5_021FF31C[])(LocalMapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int); +void(*const Unk_ov5_021FF31C[])(MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int); static const int Unk_ov5_021FF34C[] = { 0x0, @@ -1179,7 +1179,7 @@ static const int Unk_ov5_021FF34C[] = { 0x3 }; -void ov5_021EC15C (LocalMapObject * param0) +void ov5_021EC15C (MapObject * param0) { int v0, v1; UnkStruct_ov5_021EBA0C * v2 = sub_02062AF0(param0); @@ -1206,7 +1206,7 @@ void ov5_021EC15C (LocalMapObject * param0) ov5_021EC6C0(param0, v3); } -static void ov5_021EC1D8 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EC1D8 (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) { fx32 v0; @@ -1226,7 +1226,7 @@ static void ov5_021EC1D8 (LocalMapObject * param0, UnkStruct_020216E0 * param1, sub_02021368(param1, 0); } -static void ov5_021EC228 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EC228 (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) { fx32 v0; @@ -1238,7 +1238,7 @@ static void ov5_021EC228 (LocalMapObject * param0, UnkStruct_020216E0 * param1, sub_02021368(param1, (FX32_ONE)); } -static void ov5_021EC260 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EC260 (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) { fx32 v0; @@ -1277,7 +1277,7 @@ static void ov5_021EC260 (LocalMapObject * param0, UnkStruct_020216E0 * param1, sub_02021368(param1, 0); } -static void ov5_021EC324 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EC324 (MapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) { fx32 v0; @@ -1296,7 +1296,7 @@ static void ov5_021EC324 (LocalMapObject * param0, UnkStruct_020216E0 * param1, sub_02021368(param1, 0); } -static void ov5_021EC374 (LocalMapObject * param0, UnkStruct_020216E0 * param1, int param2) +static void ov5_021EC374 (MapObject * param0, UnkStruct_020216E0 * param1, int param2) { VecFx32 v0 = {0, 0, 0}; int v1 = ((sub_02021394(param1) / FX32_ONE)); @@ -1328,14 +1328,14 @@ static void ov5_021EC374 (LocalMapObject * param0, UnkStruct_020216E0 * param1, sub_02063088(param0, &v0); } -static void(*const Unk_ov5_021FF31C[])(LocalMapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int) = { +static void(*const Unk_ov5_021FF31C[])(MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int) = { ov5_021EC1D8, ov5_021EC228, ov5_021EC260, ov5_021EC324 }; -void ov5_021EC3F0 (LocalMapObject * param0) +void ov5_021EC3F0 (MapObject * param0) { int v0; UnkStruct_ov5_021EBA0C * v1 = sub_02062AF0(param0); @@ -1368,7 +1368,7 @@ void ov5_021EC3F0 (LocalMapObject * param0) ov5_021EC6C0(param0, v2); } -void ov5_021EC454 (LocalMapObject * param0) +void ov5_021EC454 (MapObject * param0) { int v0; UnkStruct_ov5_021EBA0C * v1 = sub_02062AF0(param0); @@ -1400,7 +1400,7 @@ void ov5_021EC454 (LocalMapObject * param0) ov5_021EC6C0(param0, v2); } -void ov5_021EC4BC (LocalMapObject * param0) +void ov5_021EC4BC (MapObject * param0) { int v0, v1; UnkStruct_ov5_021EBA0C * v2 = sub_02062AF0(param0); @@ -1444,7 +1444,7 @@ void ov5_021EC4BC (LocalMapObject * param0) ov5_021EC6C0(param0, v3); } -void ov5_021EC554 (LocalMapObject * param0) +void ov5_021EC554 (MapObject * param0) { int v0, v1; UnkStruct_ov5_021EBA0C * v2 = sub_02062AF0(param0); @@ -1476,7 +1476,7 @@ void ov5_021EC554 (LocalMapObject * param0) v2->unk_02 = sub_02062A14(param0); } -void ov5_021EC5C0 (LocalMapObject * param0) +void ov5_021EC5C0 (MapObject * param0) { int v0, v1; UnkStruct_ov5_021EBA0C * v2 = sub_02062AF0(param0); @@ -1555,7 +1555,7 @@ static void ov5_021EC69C (UnkStruct_020216E0 * param0, int param1) sub_020213A4(param0, v0); } -static void ov5_021EC6C0 (LocalMapObject * param0, UnkStruct_020216E0 * param1) +static void ov5_021EC6C0 (MapObject * param0, UnkStruct_020216E0 * param1) { int v0 = 1; @@ -1588,7 +1588,7 @@ static void ov5_021EC700 (u32 param0, VecFx32 * param1) GF_ASSERT(0); } -void ov5_021EC734 (LocalMapObject * param0) +void ov5_021EC734 (MapObject * param0) { VecFx32 v0; UnkStruct_ov5_021EC760 * v1; @@ -1598,12 +1598,12 @@ void ov5_021EC734 (LocalMapObject * param0) v1->unk_00 = ov5_021F121C(param0, &v0); } -void ov5_021EC75C (LocalMapObject * param0) +void ov5_021EC75C (MapObject * param0) { return; } -void ov5_021EC760 (LocalMapObject * param0) +void ov5_021EC760 (MapObject * param0) { UnkStruct_ov5_021EC760 * v0; @@ -1615,7 +1615,7 @@ void ov5_021EC760 (LocalMapObject * param0) } } -void ov5_021EC778 (LocalMapObject * param0) +void ov5_021EC778 (MapObject * param0) { UnkStruct_ov5_021EC760 * v0; @@ -1627,7 +1627,7 @@ void ov5_021EC778 (LocalMapObject * param0) } } -void ov5_021EC790 (LocalMapObject * param0) +void ov5_021EC790 (MapObject * param0) { VecFx32 v0; UnkStruct_ov5_021EC760 * v1; @@ -1637,7 +1637,7 @@ void ov5_021EC790 (LocalMapObject * param0) v1->unk_00 = ov5_021F121C(param0, &v0); } -void ov5_021EC7B8 (LocalMapObject * param0) +void ov5_021EC7B8 (MapObject * param0) { UnkStruct_ov5_021EC760 * v0; @@ -1645,7 +1645,7 @@ void ov5_021EC7B8 (LocalMapObject * param0) v0->unk_00 = ov5_021F2438(param0); } -void ov5_021EC7D0 (LocalMapObject * param0) +void ov5_021EC7D0 (MapObject * param0) { UnkStruct_ov5_021EC760 * v0; @@ -1654,7 +1654,7 @@ void ov5_021EC7D0 (LocalMapObject * param0) v0->unk_00 = ov5_021F2438(param0); } -void ov5_021EC7F0 (LocalMapObject * param0) +void ov5_021EC7F0 (MapObject * param0) { UnkStruct_ov5_021EC760 * v0; @@ -1672,7 +1672,7 @@ static void ov5_021EC804 (UnkStruct_020216E0 * param0, void * param1) NNS_G3dMdlSetMdlAlphaAll(v1, v0->unk_10); } -void ov5_021EC824 (LocalMapObject * param0) +void ov5_021EC824 (MapObject * param0) { UnkStruct_ov5_021EC804 * v0; @@ -1687,7 +1687,7 @@ void ov5_021EC824 (LocalMapObject * param0) } } -void ov5_021EC858 (LocalMapObject * param0) +void ov5_021EC858 (MapObject * param0) { UnkStruct_ov5_021EC804 * v0; @@ -1695,7 +1695,7 @@ void ov5_021EC858 (LocalMapObject * param0) ov5_021ECFA4(param0, &v0->unk_04); } -void ov5_021EC86C (LocalMapObject * param0) +void ov5_021EC86C (MapObject * param0) { UnkStruct_ov5_021EC804 * v0; @@ -1706,10 +1706,10 @@ void ov5_021EC86C (LocalMapObject * param0) } ov5_021ECFA4(param0, &v0->unk_04); - sub_020628BC(param0, (1 << 21)); + MapObject_SetFlagOn(param0, (1 << 21)); } -void ov5_021EC898 (LocalMapObject * param0) +void ov5_021EC898 (MapObject * param0) { int v0; UnkStruct_ov5_021EB2EC * v1; @@ -1727,12 +1727,12 @@ void ov5_021EC898 (LocalMapObject * param0) if (v1->unk_04 != NULL) { ov5_021ED03C(v1->unk_04, &v1->unk_08); ov5_021EDEB4(param0, v1->unk_04); - sub_020628C4(param0, (1 << 21)); + MapObject_SetFlagOff(param0, (1 << 21)); sub_02021444(v1->unk_04, ov5_021EC804, v1); } } -void ov5_021EC8EC (LocalMapObject * param0) +void ov5_021EC8EC (MapObject * param0) { int v0, v1; UnkStruct_ov5_021EC804 * v2; @@ -1762,7 +1762,7 @@ void ov5_021EC8EC (LocalMapObject * param0) ov5_021EC6C0(param0, v3); } -void ov5_021EC938 (LocalMapObject * param0) +void ov5_021EC938 (MapObject * param0) { UnkStruct_ov5_021EC938 * v0; @@ -1774,7 +1774,7 @@ void ov5_021EC938 (LocalMapObject * param0) } } -void ov5_021EC95C (LocalMapObject * param0) +void ov5_021EC95C (MapObject * param0) { UnkStruct_ov5_021EC938 * v0; @@ -1782,7 +1782,7 @@ void ov5_021EC95C (LocalMapObject * param0) ov5_021ECFA4(param0, &v0->unk_08); } -void ov5_021EC970 (LocalMapObject * param0) +void ov5_021EC970 (MapObject * param0) { UnkStruct_ov5_021EC938 * v0; @@ -1793,10 +1793,10 @@ void ov5_021EC970 (LocalMapObject * param0) } ov5_021ECFA4(param0, &v0->unk_08); - sub_020628BC(param0, (1 << 21)); + MapObject_SetFlagOn(param0, (1 << 21)); } -void ov5_021EC9A0 (LocalMapObject * param0) +void ov5_021EC9A0 (MapObject * param0) { int v0; UnkStruct_ov5_021EC938 * v1; @@ -1814,11 +1814,11 @@ void ov5_021EC9A0 (LocalMapObject * param0) if (v1->unk_08 != NULL) { ov5_021ED03C(v1->unk_08, &v1->unk_0C); ov5_021EDEB4(param0, v1->unk_08); - sub_020628C4(param0, (1 << 21)); + MapObject_SetFlagOff(param0, (1 << 21)); } } -void ov5_021EC9E8 (LocalMapObject * param0) +void ov5_021EC9E8 (MapObject * param0) { int v0, v1; UnkStruct_ov5_021EC938 * v2; diff --git a/src/overlay005/ov5_021ECA70.c b/src/overlay005/ov5_021ECA70.c index 2da748d65b..1cba906757 100644 --- a/src/overlay005/ov5_021ECA70.c +++ b/src/overlay005/ov5_021ECA70.c @@ -17,12 +17,12 @@ typedef struct UnkStruct_ov5_021ECB8C_t { UnkStruct_ov5_021ED01C unk_04; }; -static void ov5_021ECB90(LocalMapObject * param0); -static void ov5_021ECBA4(LocalMapObject * param0); -static void ov5_021ECBCC(LocalMapObject * param0, UnkStruct_020216E0 * param1); -static void ov5_021ECC0C(LocalMapObject * param0); +static void ov5_021ECB90(MapObject * param0); +static void ov5_021ECBA4(MapObject * param0); +static void ov5_021ECBCC(MapObject * param0, UnkStruct_020216E0 * param1); +static void ov5_021ECC0C(MapObject * param0); -void ov5_021ECA70 (LocalMapObject * param0) +void ov5_021ECA70 (MapObject * param0) { VecFx32 v0; @@ -35,7 +35,7 @@ void ov5_021ECA70 (LocalMapObject * param0) sub_020630AC(param0, &v0); } -void ov5_021ECA90 (LocalMapObject * param0) +void ov5_021ECA90 (MapObject * param0) { UnkStruct_ov5_021ECB8C * v0 = sub_02062AF0(param0); UnkStruct_020216E0 * v1 = v0->unk_00; @@ -52,12 +52,12 @@ void ov5_021ECA90 (LocalMapObject * param0) sub_02021368(v1, FX32_ONE); } -void ov5_021ECABC (LocalMapObject * param0) +void ov5_021ECABC (MapObject * param0) { ov5_021ECC0C(param0); } -void ov5_021ECAC4 (LocalMapObject * param0) +void ov5_021ECAC4 (MapObject * param0) { UnkStruct_ov5_021ECB8C * v0; @@ -68,10 +68,10 @@ void ov5_021ECAC4 (LocalMapObject * param0) } ov5_021ECFA4(param0, &v0->unk_00); - sub_020628BC(param0, (1 << 21)); + MapObject_SetFlagOn(param0, (1 << 21)); } -void ov5_021ECAF0 (LocalMapObject * param0) +void ov5_021ECAF0 (MapObject * param0) { UnkStruct_ov5_021ECB8C * v0; @@ -88,11 +88,11 @@ void ov5_021ECAF0 (LocalMapObject * param0) if (v0->unk_00 != NULL) { ov5_021ED03C(v0->unk_00, &v0->unk_04); ov5_021EDEB4(param0, v0->unk_00); - sub_020628C4(param0, (1 << 21)); + MapObject_SetFlagOff(param0, (1 << 21)); } } -void ov5_021ECB34 (LocalMapObject * param0) +void ov5_021ECB34 (MapObject * param0) { VecFx32 v0; @@ -105,7 +105,7 @@ void ov5_021ECB34 (LocalMapObject * param0) sub_020630AC(param0, &v0); } -void ov5_021ECB58 (LocalMapObject * param0) +void ov5_021ECB58 (MapObject * param0) { UnkStruct_ov5_021ECB8C * v0 = sub_02062AF0(param0); UnkStruct_020216E0 * v1 = v0->unk_00; @@ -121,12 +121,12 @@ void ov5_021ECB58 (LocalMapObject * param0) ov5_021ECBA4(param0); } -void ov5_021ECB78 (LocalMapObject * param0) +void ov5_021ECB78 (MapObject * param0) { ov5_021ECC0C(param0); } -UnkStruct_020216E0 * ov5_021ECB80 (LocalMapObject * param0) +UnkStruct_020216E0 * ov5_021ECB80 (MapObject * param0) { UnkStruct_ov5_021ECB8C * v0 = sub_02062AF0(param0); return ov5_021ECB8C(v0); @@ -137,7 +137,7 @@ UnkStruct_020216E0 * ov5_021ECB8C (UnkStruct_ov5_021ECB8C * param0) return param0->unk_00; } -static void ov5_021ECB90 (LocalMapObject * param0) +static void ov5_021ECB90 (MapObject * param0) { UnkStruct_ov5_021ECB8C * v0; @@ -146,7 +146,7 @@ static void ov5_021ECB90 (LocalMapObject * param0) ov5_021ECF04(param0, &v0->unk_00); } -static void ov5_021ECBA4 (LocalMapObject * param0) +static void ov5_021ECBA4 (MapObject * param0) { UnkStruct_ov5_021ECB8C * v0 = sub_02062AF0(param0); UnkStruct_020216E0 * v1 = v0->unk_00; @@ -156,7 +156,7 @@ static void ov5_021ECBA4 (LocalMapObject * param0) ov5_021ECBCC(param0, v1); } -static void ov5_021ECBCC (LocalMapObject * param0, UnkStruct_020216E0 * param1) +static void ov5_021ECBCC (MapObject * param0, UnkStruct_020216E0 * param1) { int v0 = 1; @@ -173,7 +173,7 @@ static void ov5_021ECBCC (LocalMapObject * param0, UnkStruct_020216E0 * param1) sub_02021320(param1, v0); } -static void ov5_021ECC0C (LocalMapObject * param0) +static void ov5_021ECC0C (MapObject * param0) { UnkStruct_ov5_021ECB8C * v0; diff --git a/src/overlay005/ov5_021ECC20.c b/src/overlay005/ov5_021ECC20.c index 0165b137f0..f5ef92214d 100644 --- a/src/overlay005/ov5_021ECC20.c +++ b/src/overlay005/ov5_021ECC20.c @@ -62,7 +62,7 @@ static void ov5_021ECCBC (MapObjectManager * param0) NARC_dtor(v0); } -void ov5_021ECCC8 (LocalMapObject * param0) +void ov5_021ECCC8 (MapObject * param0) { const MapObjectManager * v0 = sub_02062A40(param0); @@ -79,7 +79,7 @@ void ov5_021ECCC8 (LocalMapObject * param0) } } -const UnkStruct_ov5_021ECD10 * ov5_021ECD04 (const LocalMapObject * param0) +const UnkStruct_ov5_021ECD10 * ov5_021ECD04 (const MapObject * param0) { int v0 = sub_02062920(param0); const UnkStruct_ov5_021ECD10 * v1 = ov5_021ECD10(v0); @@ -103,7 +103,7 @@ static const UnkStruct_ov5_021ECD10 * ov5_021ECD10 (int param0) return NULL; } -int ov5_021ECD38 (const LocalMapObject * param0) +int ov5_021ECD38 (const MapObject * param0) { if (sub_02062DE8(param0) == 1) { if (sub_02062F7C(param0) == 0) { @@ -135,7 +135,7 @@ void * ov5_021ECD68 (const MapObjectManager * param0, u32 param1, int param2) return v0; } -void ov5_021ECDA0 (const LocalMapObject * param0, VecFx32 * param1) +void ov5_021ECDA0 (const MapObject * param0, VecFx32 * param1) { VecFx32 v0, v1, v2, v3; @@ -149,7 +149,7 @@ void ov5_021ECDA0 (const LocalMapObject * param0, VecFx32 * param1) param1->z = v0.z + v1.z + v2.z + v3.z; } -void ov5_021ECDFC (LocalMapObject * param0, int param1) +void ov5_021ECDFC (MapObject * param0, int param1) { sub_02062974(param0, param1); @@ -158,28 +158,28 @@ void ov5_021ECDFC (LocalMapObject * param0, int param1) } } -void ov5_021ECE18 (LocalMapObject * param0) +void ov5_021ECE18 (MapObject * param0) { sub_02062D64(param0, 1); - sub_020628BC(param0, (1 << 20)); + MapObject_SetFlagOn(param0, (1 << 20)); } -void ov5_021ECE30 (LocalMapObject * param0) +void ov5_021ECE30 (MapObject * param0) { return; } -void ov5_021ECE34 (LocalMapObject * param0) +void ov5_021ECE34 (MapObject * param0) { return; } -void ov5_021ECE38 (LocalMapObject * param0) +void ov5_021ECE38 (MapObject * param0) { return; } -void ov5_021ECE3C (LocalMapObject * param0) +void ov5_021ECE3C (MapObject * param0) { return; } diff --git a/src/overlay005/ov5_021ECE40.c b/src/overlay005/ov5_021ECE40.c index 8b934e61f1..7afbaafcbe 100644 --- a/src/overlay005/ov5_021ECE40.c +++ b/src/overlay005/ov5_021ECE40.c @@ -73,19 +73,19 @@ typedef struct { UnkStruct_02024184 unk_14; UnkStruct_020216E0 * unk_24; UnkStruct_ov5_021DF84C unk_28; - LocalMapObject * unk_50; + MapObject * unk_50; UnkStruct_ov101_021D5D90 * unk_54; void * unk_58; UnkFuncPtr_ov5_021EE454 unk_5C; } UnkStruct_ov5_021EE698; -static void ov5_021ED094(const LocalMapObject * param0); +static void ov5_021ED094(const MapObject * param0); static void ov5_021ED0A4(UnkStruct_ov5_021ED0A4 * param0, int param1); static void ov5_021ED0F0(UnkStruct_ov5_021ED0A4 * param0); static UnkStruct_ov5_021DF84C * ov5_021ED110(UnkStruct_ov5_021ED0A4 * param0, u32 param1); static void ov5_021ED184(UnkStruct_ov5_021ED0A4 * param0, u32 param1); static void ov5_021ED1A4(UnkStruct_ov5_021ED0A4 * param0); -static int ov5_021ED1C8(const MapObjectManager * param0, const LocalMapObject * param1, int param2); +static int ov5_021ED1C8(const MapObjectManager * param0, const MapObject * param1, int param2); static void ov5_021ED224(UnkStruct_ov5_021ED0A4 * param0, int param1, int param2, int param3, int param4, int param5, int param6); static void ov5_021ED2AC(UnkStruct_ov5_021ED0A4 * param0); static const UnkStruct_ov5_021ED2D0 * ov5_021ED2D0(int param0, int param1, const UnkStruct_ov5_021ED2D0 * param2); @@ -133,9 +133,9 @@ static void ov5_021ED9C4(UnkStruct_ov5_021ED0A4 * param0, int param1); static void ov5_021ED9DC(UnkStruct_ov5_021ED0A4 * param0, int param1); static void ov5_021ED9F4(UnkStruct_ov5_021ED0A4 * param0, int param1); static void ov5_021EDA0C(UnkStruct_ov5_021ED0A4 * param0, int param1); -static int ov5_021EDA54(const MapObjectManager * param0, int param1, const LocalMapObject * param2); -static int ov5_021EDAB4(const MapObjectManager * param0, int param1, const LocalMapObject * param2); -static int ov5_021EDB3C(const MapObjectManager * param0, int param1, const LocalMapObject * param2); +static int ov5_021EDA54(const MapObjectManager * param0, int param1, const MapObject * param2); +static int ov5_021EDAB4(const MapObjectManager * param0, int param1, const MapObject * param2); +static int ov5_021EDB3C(const MapObjectManager * param0, int param1, const MapObject * param2); static int * ov5_021EDCB8(UnkStruct_ov5_021ED0A4 * param0); static int * ov5_021EDCBC(UnkStruct_ov5_021ED0A4 * param0); static int * ov5_021EDCC0(UnkStruct_ov5_021ED0A4 * param0); @@ -161,7 +161,7 @@ static void ov5_021EDDAC(UnkStruct_ov5_021ED0A4 * param0, int param1); static void ov5_021EDDD4(UnkStruct_02020C44 * param0); static UnkStruct_020216E0 * ov5_021EDDDC(UnkStruct_02020C44 * param0, const UnkStruct_ov5_021DF84C * param1, const VecFx32 * param2, u32 param3); static void ov5_021EDE3C(UnkStruct_ov5_021ED0A4 * param0, u32 param1, UnkStruct_ov5_021DF84C * param2); -static UnkStruct_ov5_021ED0A4 * ov5_021EDEA8(const LocalMapObject * param0); +static UnkStruct_ov5_021ED0A4 * ov5_021EDEA8(const MapObject * param0); static int ov5_021EDF3C(UnkStruct_ov5_021ED0A4 * param0, int param1, u32 param2, int param3); static void ov5_021EDFBC(UnkStruct_ov5_021ED0A4 * param0, int param1); static int ov5_021EDFF0(UnkStruct_ov5_021ED0A4 * param0, int param1); @@ -171,14 +171,14 @@ static void ov5_021EE134(UnkStruct_ov5_021ED0A4 * param0, int param1); static void ov5_021EE170(UnkStruct_ov5_021ED0A4 * param0, int param1); static void ov5_021EE1AC(SysTask * param0, void * param1); static void ov5_021EE1E8(SysTask * param0, void * param1); -static void ov5_021EE228(UnkStruct_ov5_021ED0A4 * param0, LocalMapObject * param1, UnkStruct_020216E0 ** param2, int param3); -static void ov5_021EE264(UnkStruct_ov5_021ED0A4 * param0, const LocalMapObject * param1); +static void ov5_021EE228(UnkStruct_ov5_021ED0A4 * param0, MapObject * param1, UnkStruct_020216E0 ** param2, int param3); +static void ov5_021EE264(UnkStruct_ov5_021ED0A4 * param0, const MapObject * param1); static void ov5_021EE2C4(SysTask * param0, void * param1); static void ov5_021EE294(UnkStruct_ov5_021ED0A4 * param0); static void ov5_021EE2D0(UnkStruct_ov5_021ED0A4 * param0, UnkStruct_ov5_021EE294 * param1); static void ov5_021EE320(UnkStruct_ov5_021ED0A4 * param0, int param1, int param2); static void ov5_021EE3C4(UnkStruct_ov5_021ED0A4 * param0); -static UnkStruct_020216E0 * ov5_021EE454(LocalMapObject * param0, int param1, UnkFuncPtr_ov5_021EE454 param2, void * param3); +static UnkStruct_020216E0 * ov5_021EE454(MapObject * param0, int param1, UnkFuncPtr_ov5_021EE454 param2, void * param3); static void ov5_021EE698(SysTask * param0, void * param1); void ov5_021ECE40 (UnkStruct_ov5_021ED0A4 * param0, const MapObjectManager * param1, int param2, int param3, int param4, int param5, const int * param6, int param7) @@ -200,7 +200,7 @@ void ov5_021ECE94 (UnkStruct_ov5_021ED0A4 * param0) ov5_021ED2AC(param0); } -int ov5_021ECEB4 (LocalMapObject * param0, UnkStruct_020216E0 ** param1, int param2) +int ov5_021ECEB4 (MapObject * param0, UnkStruct_020216E0 ** param1, int param2) { int v0; UnkStruct_ov5_021ED0A4 * v1; @@ -224,7 +224,7 @@ int ov5_021ECEB4 (LocalMapObject * param0, UnkStruct_020216E0 ** param1, int par return v0; } -int ov5_021ECF04 (LocalMapObject * param0, UnkStruct_020216E0 ** param1) +int ov5_021ECF04 (MapObject * param0, UnkStruct_020216E0 ** param1) { int v0 = sub_02062920(param0); int v1 = ov5_021ECEB4(param0, param1, v0); @@ -232,7 +232,7 @@ int ov5_021ECF04 (LocalMapObject * param0, UnkStruct_020216E0 ** param1) return v1; } -UnkStruct_020216E0 * ov5_021ECF1C (LocalMapObject * param0, int param1) +UnkStruct_020216E0 * ov5_021ECF1C (MapObject * param0, int param1) { VecFx32 v0; UnkStruct_02020C44 * v1; @@ -256,7 +256,7 @@ UnkStruct_020216E0 * ov5_021ECF1C (LocalMapObject * param0, int param1) return v2; } -void ov5_021ECF70 (const LocalMapObject * param0, UnkStruct_020216E0 ** param1, int param2) +void ov5_021ECF70 (const MapObject * param0, UnkStruct_020216E0 ** param1, int param2) { int v0; @@ -270,7 +270,7 @@ void ov5_021ECF70 (const LocalMapObject * param0, UnkStruct_020216E0 ** param1, } } -void ov5_021ECFA4 (const LocalMapObject * param0, UnkStruct_020216E0 ** param1) +void ov5_021ECFA4 (const MapObject * param0, UnkStruct_020216E0 ** param1) { ov5_021ED094(param0); @@ -285,7 +285,7 @@ void ov5_021ECFA4 (const LocalMapObject * param0, UnkStruct_020216E0 ** param1) } } -void ov5_021ECFD8 (const LocalMapObject * param0, UnkStruct_020216E0 ** param1, int param2) +void ov5_021ECFD8 (const MapObject * param0, UnkStruct_020216E0 ** param1, int param2) { int v0; @@ -319,7 +319,7 @@ void ov5_021ED03C (UnkStruct_020216E0 * param0, UnkStruct_ov5_021ED01C * param1) sub_02021380(param0, param1->unk_04); } -void ov5_021ED060 (LocalMapObject * param0, UnkStruct_020216E0 ** param1, int param2) +void ov5_021ED060 (MapObject * param0, UnkStruct_020216E0 ** param1, int param2) { UnkStruct_ov5_021ED0A4 * v0 = ov5_021EDEA8(param0); @@ -330,7 +330,7 @@ void ov5_021ED060 (LocalMapObject * param0, UnkStruct_020216E0 ** param1, int pa } } -static void ov5_021ED094 (const LocalMapObject * param0) +static void ov5_021ED094 (const MapObject * param0) { UnkStruct_ov5_021ED0A4 * v0 = ov5_021EDEA8(param0); @@ -469,10 +469,10 @@ static void ov5_021ED1A4 (UnkStruct_ov5_021ED0A4 * param0) } while (v0); } -static int ov5_021ED1C8 (const MapObjectManager * param0, const LocalMapObject * param1, int param2) +static int ov5_021ED1C8 (const MapObjectManager * param0, const MapObject * param1, int param2) { int v0, v1; - const LocalMapObject * v2; + const MapObject * v2; v0 = sub_02062824(param0); v2 = sub_02062868(param0); @@ -1101,10 +1101,10 @@ void ov5_021EDA38 (MapObjectManager * param0, UnkStruct_ov5_021ED0A4 * param1) ov5_021ED8B8(param0, param1); } -static int ov5_021EDA54 (const MapObjectManager * param0, int param1, const LocalMapObject * param2) +static int ov5_021EDA54 (const MapObjectManager * param0, int param1, const MapObject * param2) { int v0 = 0, v1; - LocalMapObject * v2 = NULL; + MapObject * v2 = NULL; while (sub_020625B0(param0, &v2, &v0, (1 << 0)) == 1) { if ((param2 != NULL) && (param2 == v2)) { @@ -1125,10 +1125,10 @@ static int ov5_021EDA54 (const MapObjectManager * param0, int param1, const Loca return 0; } -static int ov5_021EDAB4 (const MapObjectManager * param0, int param1, const LocalMapObject * param2) +static int ov5_021EDAB4 (const MapObjectManager * param0, int param1, const MapObject * param2) { int v0, v1 = 0; - LocalMapObject * v2 = NULL; + MapObject * v2 = NULL; while (sub_020625B0(param0, &v2, &v1, (1 << 0)) == 1) { if ((param2 != NULL) && (param2 == v2)) { @@ -1163,10 +1163,10 @@ static int ov5_021EDAB4 (const MapObjectManager * param0, int param1, const Loca return 0; } -static int ov5_021EDB3C (const MapObjectManager * param0, int param1, const LocalMapObject * param2) +static int ov5_021EDB3C (const MapObjectManager * param0, int param1, const MapObject * param2) { int v0, v1 = 0; - LocalMapObject * v2 = NULL; + MapObject * v2 = NULL; while (sub_020625B0(param0, &v2, &v1, (1 << 0)) == 1) { if ((param2 != NULL) && (v2 == param2)) { @@ -1201,7 +1201,7 @@ static int ov5_021EDB3C (const MapObjectManager * param0, int param1, const Loca return 0; } -void ov5_021EDBC4 (const MapObjectManager * param0, int param1, LocalMapObject * param2) +void ov5_021EDBC4 (const MapObjectManager * param0, int param1, MapObject * param2) { int v0; UnkStruct_ov5_021ED0A4 * v1 = sub_0206285C(param0); @@ -1405,16 +1405,16 @@ static u32 ov5_021EDD50 (int param0) return 1; } -void ov5_021EDD78 (LocalMapObject * param0, int param1) +void ov5_021EDD78 (MapObject * param0, int param1) { if (param1 == 1) { - sub_020628BC(param0, (1 << 22)); + MapObject_SetFlagOn(param0, (1 << 22)); } else { - sub_020628C4(param0, (1 << 22)); + MapObject_SetFlagOff(param0, (1 << 22)); } } -int ov5_021EDD94 (LocalMapObject * param0) +int ov5_021EDD94 (MapObject * param0) { if (sub_020628D0(param0, (1 << 22))) { return 1; @@ -1500,7 +1500,7 @@ static void ov5_021EDE3C (UnkStruct_ov5_021ED0A4 * param0, u32 param1, UnkStruct } } -static UnkStruct_ov5_021ED0A4 * ov5_021EDEA8 (const LocalMapObject * param0) +static UnkStruct_ov5_021ED0A4 * ov5_021EDEA8 (const MapObject * param0) { const MapObjectManager * v0; @@ -1508,7 +1508,7 @@ static UnkStruct_ov5_021ED0A4 * ov5_021EDEA8 (const LocalMapObject * param0) return (UnkStruct_ov5_021ED0A4 *)sub_0206285C(v0); } -BOOL ov5_021EDEB4 (LocalMapObject * param0, UnkStruct_020216E0 * param1) +BOOL ov5_021EDEB4 (MapObject * param0, UnkStruct_020216E0 * param1) { BOOL v0; VecFx32 v1; @@ -1524,7 +1524,7 @@ BOOL ov5_021EDEB4 (LocalMapObject * param0, UnkStruct_020216E0 * param1) return 0; } -void ov5_021EDED8 (LocalMapObject * param0, UnkStruct_020216E0 * param1) +void ov5_021EDED8 (MapObject * param0, UnkStruct_020216E0 * param1) { int v0 = 1; @@ -1791,7 +1791,7 @@ static void ov5_021EE1E8 (SysTask * param0, void * param1) v2->unk_06 = 0; } -static void ov5_021EE228 (UnkStruct_ov5_021ED0A4 * param0, LocalMapObject * param1, UnkStruct_020216E0 ** param2, int param3) +static void ov5_021EE228 (UnkStruct_ov5_021ED0A4 * param0, MapObject * param1, UnkStruct_020216E0 ** param2, int param3) { int v0 = 0; UnkStruct_ov5_021EDF3C * v1 = param0->unk_100; @@ -1815,7 +1815,7 @@ static void ov5_021EE228 (UnkStruct_ov5_021ED0A4 * param0, LocalMapObject * para GF_ASSERT(FALSE); } -static void ov5_021EE264 (UnkStruct_ov5_021ED0A4 * param0, const LocalMapObject * param1) +static void ov5_021EE264 (UnkStruct_ov5_021ED0A4 * param0, const MapObject * param1) { int v0 = 0; UnkStruct_ov5_021EDF3C * v1 = param0->unk_100; @@ -1925,7 +1925,7 @@ static void ov5_021EE3C4 (UnkStruct_ov5_021ED0A4 * param0) param0->unk_100 = NULL; } -UnkStruct_020216E0 * ov5_021EE3FC (LocalMapObject * param0, int param1, UnkFuncPtr_ov5_021EE454 param2, void * param3) +UnkStruct_020216E0 * ov5_021EE3FC (MapObject * param0, int param1, UnkFuncPtr_ov5_021EE454 param2, void * param3) { if ((ov5_021EDD94(param0) == 1) || (ov5_021EB1A0(param0) == NULL)) { int v0 = sub_02062920(param0); @@ -1940,7 +1940,7 @@ UnkStruct_020216E0 * ov5_021EE3FC (LocalMapObject * param0, int param1, UnkFuncP return ov5_021EE454(param0, param1, param2, param3); } -static UnkStruct_020216E0 * ov5_021EE454 (LocalMapObject * param0, int param1, UnkFuncPtr_ov5_021EE454 param2, void * param3) +static UnkStruct_020216E0 * ov5_021EE454 (MapObject * param0, int param1, UnkFuncPtr_ov5_021EE454 param2, void * param3) { VecFx32 v0; int v1, v2, v3, v4; @@ -2075,7 +2075,7 @@ static UnkStruct_020216E0 * ov5_021EE454 (LocalMapObject * param0, int param1, U static void ov5_021EE698 (SysTask * param0, void * param1) { UnkStruct_ov5_021EE698 * v0 = param1; - LocalMapObject * v1 = v0->unk_50; + MapObject * v1 = v0->unk_50; switch (v0->unk_04) { case 0: diff --git a/src/overlay005/ov5_021F08CC.c b/src/overlay005/ov5_021F08CC.c index 626817cbf7..4a45de77e7 100644 --- a/src/overlay005/ov5_021F08CC.c +++ b/src/overlay005/ov5_021F08CC.c @@ -83,7 +83,7 @@ static void ov5_021F0DE8(UnkStruct_ov5_021F0D6C * param0, u32 param1); static int ov5_021F0E24(UnkStruct_ov5_021F0D6C * param0); static u16 ov5_021F0E58(int param0); -int(*const Unk_ov5_021FFA0C[])(UnkStruct_ov5_021F0D6C *, PlayerAvatar *, LocalMapObject *); +int(*const Unk_ov5_021FFA0C[])(UnkStruct_ov5_021F0D6C *, PlayerAvatar *, MapObject *); const int Unk_ov5_021FFA00[]; void * ov5_021F08CC (FieldSystem * param0, u32 param1, int param2) @@ -187,14 +187,14 @@ static void ov5_021F0A04 (SysTask * param0, void * param1) { UnkStruct_ov5_021F0D6C * v0 = param1; PlayerAvatar * v1 = v0->unk_20->playerAvatar; - LocalMapObject * v2 = Player_LocalMapObject(v1); + MapObject * v2 = Player_MapObject(v1); while (Unk_ov5_021FFA0C[v0->unk_0C](v0, v1, v2)) { (void)0; } } -static int ov5_021F0A30 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2) +static int ov5_021F0A30 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, MapObject * param2) { ov5_021F0D6C(param0); sub_02062DDC(param2); @@ -203,7 +203,7 @@ static int ov5_021F0A30 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, return 1; } -static int ov5_021F0A48 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2) +static int ov5_021F0A48 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, MapObject * param2) { if (LocalMapObj_IsAnimationSet(param2) == 1) { sub_020656AC(param2); @@ -216,7 +216,7 @@ static int ov5_021F0A48 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, return 0; } -static int ov5_021F0A80 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2) +static int ov5_021F0A80 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, MapObject * param2) { param0->unk_10++; @@ -238,7 +238,7 @@ static int ov5_021F0A80 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, return 1; } -static int ov5_021F0AB8 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2) +static int ov5_021F0AB8 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, MapObject * param2) { param0->unk_14 = ((LCRNG_Next() % 4) + 1) * 30; param0->unk_18 = Unk_ov5_021FFA00[param0->unk_1C]; @@ -247,7 +247,7 @@ static int ov5_021F0AB8 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, return 1; } -static int ov5_021F0AEC (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2) +static int ov5_021F0AEC (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, MapObject * param2) { param0->unk_14--; @@ -268,7 +268,7 @@ static int ov5_021F0AEC (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, return 1; } -static int ov5_021F0B30 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2) +static int ov5_021F0B30 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, MapObject * param2) { param0->unk_18--; @@ -286,7 +286,7 @@ static int ov5_021F0B30 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, return 0; } -static int ov5_021F0B5C (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2) +static int ov5_021F0B5C (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, MapObject * param2) { ov5_021F5C58(param0->unk_24); sub_02062A0C(param2, 0x3); @@ -297,7 +297,7 @@ static int ov5_021F0B5C (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, return 0; } -static int ov5_021F0B7C (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2) +static int ov5_021F0B7C (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, MapObject * param2) { param0->unk_10++; @@ -315,7 +315,7 @@ static int ov5_021F0B7C (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, return 0; } -static int ov5_021F0BB0 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2) +static int ov5_021F0BB0 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, MapObject * param2) { if (ov5_021F0E24(param0) == 0) { return 0; @@ -325,7 +325,7 @@ static int ov5_021F0BB0 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, return 1; } -static int ov5_021F0BC8 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2) +static int ov5_021F0BC8 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, MapObject * param2) { param0->unk_08 = 1; param0->unk_0C = 15; @@ -333,7 +333,7 @@ static int ov5_021F0BC8 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, return 1; } -static int ov5_021F0BD4 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2) +static int ov5_021F0BD4 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, MapObject * param2) { sub_02062A0C(param2, 0x0); ov5_021F0DE8(param0, 56); @@ -344,7 +344,7 @@ static int ov5_021F0BD4 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, return 1; } -static int ov5_021F0BF4 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2) +static int ov5_021F0BF4 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, MapObject * param2) { sub_02062A0C(param2, 0x0); ov5_021F0DE8(param0, 55); @@ -362,7 +362,7 @@ static int ov5_021F0BF4 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, return 1; } -static int ov5_021F0C34 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2) +static int ov5_021F0C34 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, MapObject * param2) { param0->unk_10 = 30 * 4; param0->unk_0C = 13; @@ -370,7 +370,7 @@ static int ov5_021F0C34 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, return 1; } -static int ov5_021F0C40 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2) +static int ov5_021F0C40 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, MapObject * param2) { param0->unk_10--; @@ -392,7 +392,7 @@ static int ov5_021F0C40 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, return 0; } -static int ov5_021F0C84 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2) +static int ov5_021F0C84 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, MapObject * param2) { param0->unk_10++; @@ -411,7 +411,7 @@ static int ov5_021F0C84 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, return 1; } -static int ov5_021F0CB0 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2) +static int ov5_021F0CB0 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, MapObject * param2) { if (param0->unk_24 != NULL) { ov5_021F5C58(param0->unk_24); @@ -433,7 +433,7 @@ static int ov5_021F0CB0 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, return 1; } -static int ov5_021F0CEC (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2) +static int ov5_021F0CEC (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, MapObject * param2) { param0->unk_10++; @@ -444,7 +444,7 @@ static int ov5_021F0CEC (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, return 0; } -static int ov5_021F0D00 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2) +static int ov5_021F0D00 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, MapObject * param2) { if (param0->unk_24 != NULL) { sub_0207136C(param0->unk_24); @@ -455,7 +455,7 @@ static int ov5_021F0D00 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, return 0; } -static int(*const Unk_ov5_021FFA0C[])(UnkStruct_ov5_021F0D6C *, PlayerAvatar *, LocalMapObject *) = { +static int(*const Unk_ov5_021FFA0C[])(UnkStruct_ov5_021F0D6C *, PlayerAvatar *, MapObject *) = { ov5_021F0A30, ov5_021F0A48, ov5_021F0A80, diff --git a/src/overlay005/ov5_021F10E8.c b/src/overlay005/ov5_021F10E8.c index c4b3b2ff8c..51899427d7 100644 --- a/src/overlay005/ov5_021F10E8.c +++ b/src/overlay005/ov5_021F10E8.c @@ -30,7 +30,7 @@ typedef struct { typedef struct { u32 unk_00; UnkStruct_ov5_021DF47C * unk_04; - const LocalMapObject * unk_08; + const MapObject * unk_08; } UnkStruct_021F121C; typedef struct { @@ -178,7 +178,7 @@ UnkStruct_02073B50 * ov5_021F11FC (UnkStruct_ov5_021DF47C * param0, u32 param1) return &v1->unk_18; } -UnkStruct_ov101_021D5D90 * ov5_021F121C (const LocalMapObject * param0, const VecFx32 * param1) +UnkStruct_ov101_021D5D90 * ov5_021F121C (const MapObject * param0, const VecFx32 * param1) { int v0; UnkStruct_ov101_021D5D90 * v1; @@ -224,7 +224,7 @@ static void ov5_021F12A8 (UnkStruct_ov101_021D5D90 * param0, void * param1) static void ov5_021F12AC (UnkStruct_ov101_021D5D90 * param0, void * param1) { UnkStruct_021F1258 * v0 = param1; - const LocalMapObject * v1 = v0->unk_1C.unk_08; + const MapObject * v1 = v0->unk_1C.unk_08; if (sub_02062764(v1, v0->unk_04, v0->unk_08) == 0) { ov5_021DF74C(param0); diff --git a/src/overlay005/ov5_021F134C.c b/src/overlay005/ov5_021F134C.c index 7f74850029..3baecb21fb 100644 --- a/src/overlay005/ov5_021F134C.c +++ b/src/overlay005/ov5_021F134C.c @@ -35,7 +35,7 @@ typedef struct { typedef struct { UnkStruct_ov5_021DF47C * unk_00; UnkStruct_ov5_021F1388 * unk_04; - LocalMapObject * unk_08; + MapObject * unk_08; } UnkStruct_ov5_021F1570; typedef struct { @@ -198,7 +198,7 @@ static void ov5_021F1554 (UnkStruct_ov5_021F1388 * param0, int param1) NNS_G3dMdlSetMdlAlphaAll(param0->unk_28[0].unk_0C, param1); } -void ov5_021F1570 (LocalMapObject * param0) +void ov5_021F1570 (MapObject * param0) { int v0, v1; UnkStruct_ov5_021F1570 v2; @@ -249,7 +249,7 @@ static void ov5_021F1600 (UnkStruct_ov101_021D5D90 * param0, void * param1) static void ov5_021F1604 (UnkStruct_ov101_021D5D90 * param0, void * param1) { UnkStruct_ov5_021F15B4 * v0; - LocalMapObject * v1; + MapObject * v1; v0 = param1; v1 = v0->unk_14.unk_08; @@ -307,7 +307,7 @@ static const UnkStruct_ov101_021D86B0 Unk_ov5_022002AC = { ov5_021F1670 }; -UnkStruct_ov101_021D5D90 * ov5_021F16D4 (LocalMapObject * param0, int param1) +UnkStruct_ov101_021D5D90 * ov5_021F16D4 (MapObject * param0, int param1) { int v0; UnkStruct_ov5_021F1570 v1; @@ -329,7 +329,7 @@ UnkStruct_ov101_021D5D90 * ov5_021F16D4 (LocalMapObject * param0, int param1) static void ov5_021F1718 (UnkStruct_ov101_021D5D90 * param0, void * param1) { UnkStruct_ov5_021F15B4 * v0; - LocalMapObject * v1; + MapObject * v1; v0 = param1; v1 = v0->unk_14.unk_08; diff --git a/src/overlay005/ov5_021F17B8.c b/src/overlay005/ov5_021F17B8.c index 3e73dc5481..4ce857da2c 100644 --- a/src/overlay005/ov5_021F17B8.c +++ b/src/overlay005/ov5_021F17B8.c @@ -29,7 +29,7 @@ typedef struct { FieldSystem * unk_00; UnkStruct_ov5_021DF47C * unk_04; UnkStruct_ov5_021F17E4 * unk_08; - LocalMapObject * unk_0C; + MapObject * unk_0C; } UnkStruct_ov5_021F1800; typedef struct { @@ -63,7 +63,7 @@ typedef struct { static void ov5_021F17E4(UnkStruct_ov5_021F17E4 * param0); static void ov5_021F17F4(UnkStruct_ov5_021F17E4 * param0); -static void ov5_021F1A24(UnkStruct_ov5_021F1A24 * param0, LocalMapObject * param1, VecFx32 * param2); +static void ov5_021F1A24(UnkStruct_ov5_021F1A24 * param0, MapObject * param1, VecFx32 * param2); static void ov5_021F1A8C(UnkStruct_ov101_021D5D90 * param0, UnkStruct_ov5_021F1A24 * param1); static const UnkStruct_ov101_021D86B0 Unk_ov5_02200338; @@ -97,7 +97,7 @@ static void ov5_021F17F4 (UnkStruct_ov5_021F17E4 * param0) ov5_021DFA08(param0->unk_00, 2); } -void ov5_021F1800 (LocalMapObject * param0, int param1) +void ov5_021F1800 (MapObject * param0, int param1) { int v0; VecFx32 v1; @@ -165,7 +165,7 @@ static void ov5_021F18E0 (UnkStruct_ov101_021D5D90 * param0, void * param1) { int v0; UnkStruct_ov5_021F1A24 * v1; - LocalMapObject * v2; + MapObject * v2; v1 = param1; v2 = v1->unk_14.unk_0C; @@ -207,7 +207,7 @@ static void ov5_021F18E0 (UnkStruct_ov101_021D5D90 * param0, void * param1) static void ov5_021F1978 (UnkStruct_ov101_021D5D90 * param0, void * param1) { UnkStruct_ov5_021F1A24 * v0 = param1; - LocalMapObject * v1 = v0->unk_14.unk_0C; + MapObject * v1 = v0->unk_14.unk_0C; { int v2 = sub_02062920(v1); @@ -257,7 +257,7 @@ static const UnkStruct_ov101_021D86B0 Unk_ov5_02200338 = { ov5_021F1978 }; -static void ov5_021F1A24 (UnkStruct_ov5_021F1A24 * param0, LocalMapObject * param1, VecFx32 * param2) +static void ov5_021F1A24 (UnkStruct_ov5_021F1A24 * param0, MapObject * param1, VecFx32 * param2) { int v0; fx32 v1, v2; diff --git a/src/overlay005/ov5_021F1CC8.c b/src/overlay005/ov5_021F1CC8.c index 1f858c0269..a728c40bf7 100644 --- a/src/overlay005/ov5_021F1CC8.c +++ b/src/overlay005/ov5_021F1CC8.c @@ -44,7 +44,7 @@ static void ov5_021F1CF8(UnkStruct_021F1CF8 * param0); static void ov5_021F1D80(UnkStruct_021F1CF8 * param0); static UnkStruct_02073B50 * ov5_021F1DA4(UnkStruct_021F1CF8 * param0, int param1, int param2, int param3); static UnkStruct_02073838 * ov5_021F1E24(UnkStruct_021F1CF8 * param0, int param1, int param2, int param3); -static UnkStruct_ov101_021D5D90 * ov5_021F1ECC(const LocalMapObject * param0, int param1); +static UnkStruct_ov101_021D5D90 * ov5_021F1ECC(const MapObject * param0, int param1); static const u32 Unk_ov5_0220039C[10]; static const u32 Unk_ov5_02200374[10]; @@ -153,37 +153,37 @@ static UnkStruct_02073838 * ov5_021F1E24 (UnkStruct_021F1CF8 * param0, int param return v1; } -UnkStruct_ov101_021D5D90 * ov5_021F1E8C (const LocalMapObject * param0) +UnkStruct_ov101_021D5D90 * ov5_021F1E8C (const MapObject * param0) { return ov5_021F1ECC(param0, 0); } -UnkStruct_ov101_021D5D90 * ov5_021F1E98 (const LocalMapObject * param0) +UnkStruct_ov101_021D5D90 * ov5_021F1E98 (const MapObject * param0) { return ov5_021F1ECC(param0, 1); } -UnkStruct_ov101_021D5D90 * ov5_021F1EA4 (const LocalMapObject * param0) +UnkStruct_ov101_021D5D90 * ov5_021F1EA4 (const MapObject * param0) { return ov5_021F1ECC(param0, 2); } -UnkStruct_ov101_021D5D90 * ov5_021F1EB0 (const LocalMapObject * param0) +UnkStruct_ov101_021D5D90 * ov5_021F1EB0 (const MapObject * param0) { return ov5_021F1ECC(param0, 3); } -UnkStruct_ov101_021D5D90 * ov5_021F1EBC (const LocalMapObject * param0) +UnkStruct_ov101_021D5D90 * ov5_021F1EBC (const MapObject * param0) { return ov5_021F1ECC(param0, 4); } -UnkStruct_ov101_021D5D90 * ov5_021F1EC8 (const LocalMapObject * param0) +UnkStruct_ov101_021D5D90 * ov5_021F1EC8 (const MapObject * param0) { return NULL; } -static UnkStruct_ov101_021D5D90 * ov5_021F1ECC (const LocalMapObject * param0, int param1) +static UnkStruct_ov101_021D5D90 * ov5_021F1ECC (const MapObject * param0, int param1) { VecFx32 v0; UnkStruct_ov101_021D5D90 * v1; diff --git a/src/overlay005/ov5_021F204C.c b/src/overlay005/ov5_021F204C.c index a9dc4893ee..d2f0d4757c 100644 --- a/src/overlay005/ov5_021F204C.c +++ b/src/overlay005/ov5_021F204C.c @@ -29,7 +29,7 @@ typedef struct { typedef struct { UnkStruct_ov5_021DF47C * unk_00; UnkStruct_ov5_021F2078 * unk_04; - LocalMapObject * unk_08; + MapObject * unk_08; } UnkStruct_ov5_021F20D4; typedef struct { @@ -49,7 +49,7 @@ typedef struct { typedef struct { UnkStruct_ov5_021DF47C * unk_00; UnkStruct_ov5_021F2204 * unk_04; - LocalMapObject * unk_08; + MapObject * unk_08; } UnkStruct_ov5_021F22BC; typedef struct { @@ -115,7 +115,7 @@ static void ov5_021F20B8 (UnkStruct_ov5_021F2078 * param0) } while (v0 < (2 + 1)); } -void ov5_021F20D4 (LocalMapObject * param0) +void ov5_021F20D4 (MapObject * param0) { int v0, v1; UnkStruct_ov5_021F20D4 v2; @@ -159,7 +159,7 @@ static void ov5_021F2144 (UnkStruct_ov101_021D5D90 * param0, void * param1) static void ov5_021F2148 (UnkStruct_ov101_021D5D90 * param0, void * param1) { UnkStruct_ov5_021F2118 * v0; - LocalMapObject * v1; + MapObject * v1; v0 = param1; v1 = v0->unk_10.unk_08; @@ -275,7 +275,7 @@ static void ov5_021F22AC (UnkStruct_ov5_021F2204 * param0) } } -UnkStruct_ov101_021D5D90 * ov5_021F22BC (LocalMapObject * param0) +UnkStruct_ov101_021D5D90 * ov5_021F22BC (MapObject * param0) { VecFx32 v0; UnkStruct_ov5_021DF47C * v1; diff --git a/src/overlay005/ov5_021F23D0.c b/src/overlay005/ov5_021F23D0.c index a63e05675f..4d1459e125 100644 --- a/src/overlay005/ov5_021F23D0.c +++ b/src/overlay005/ov5_021F23D0.c @@ -25,7 +25,7 @@ typedef struct { typedef struct { UnkStruct_ov5_021DF47C * unk_00; UnkStruct_ov5_021F23FC * unk_04; - LocalMapObject * unk_08; + MapObject * unk_08; } UnkStruct_ov5_021F2438; typedef struct { @@ -74,7 +74,7 @@ static void ov5_021F2424 (UnkStruct_ov5_021F23FC * param0) sub_02073AA8(¶m0->unk_18); } -UnkStruct_ov101_021D5D90 * ov5_021F2438 (LocalMapObject * param0) +UnkStruct_ov101_021D5D90 * ov5_021F2438 (MapObject * param0) { UnkStruct_ov101_021D5D90 * v0; UnkStruct_ov5_021DF47C * v1; @@ -123,7 +123,7 @@ static int ov5_021F2488 (UnkStruct_ov101_021D5D90 * param0, void * param1) { VecFx32 v2, v3; - LocalMapObject * v4 = v0->unk_10.unk_08; + MapObject * v4 = v0->unk_10.unk_08; sub_02063050(v4, &v2); sub_02063078(v4, &v3); @@ -147,7 +147,7 @@ static void ov5_021F2510 (UnkStruct_ov101_021D5D90 * param0, void * param1) static void ov5_021F251C (UnkStruct_ov101_021D5D90 * param0, void * param1) { UnkStruct_ov5_021F247C * v0 = param1; - LocalMapObject * v1 = v0->unk_10.unk_08; + MapObject * v1 = v0->unk_10.unk_08; if (v0->unk_0C == 0) { if (sub_02062764(v1, v0->unk_04, v0->unk_08) == 0) { diff --git a/src/overlay005/ov5_021F25C0.c b/src/overlay005/ov5_021F25C0.c index 2559c67844..d216899a03 100644 --- a/src/overlay005/ov5_021F25C0.c +++ b/src/overlay005/ov5_021F25C0.c @@ -28,7 +28,7 @@ typedef struct { int unk_00; UnkStruct_ov5_021DF47C * unk_04; UnkStruct_ov5_021F25EC * unk_08; - LocalMapObject * unk_0C; + MapObject * unk_0C; } UnkStruct_ov5_021F26A8; typedef struct { @@ -79,7 +79,7 @@ static void ov5_021F2610 (UnkStruct_ov5_021F25EC * param0) sub_0207395C(¶m0->unk_04); } -UnkStruct_ov101_021D5D90 * ov5_021F261C (LocalMapObject * param0, int param1, int param2, int param3, int param4) +UnkStruct_ov101_021D5D90 * ov5_021F261C (MapObject * param0, int param1, int param2, int param3, int param4) { UnkStruct_ov5_021F26A8 v0; VecFx32 v1 = {0, 0, 0}; @@ -112,7 +112,7 @@ static int ov5_021F26A8 (UnkStruct_ov101_021D5D90 * param0, void * param1) { UnkStruct_ov5_021F26F0 * v0 = param1; const UnkStruct_ov5_021F26A8 * v1 = sub_020715BC(param0); - LocalMapObject * v2 = v1->unk_0C; + MapObject * v2 = v1->unk_0C; v0->unk_24 = *v1; v0->unk_0C = sub_02062910(v2); @@ -128,7 +128,7 @@ static int ov5_021F26A8 (UnkStruct_ov101_021D5D90 * param0, void * param1) static void ov5_021F26F0 (UnkStruct_ov101_021D5D90 * param0, void * param1) { UnkStruct_ov5_021F26F0 * v0 = param1; - LocalMapObject * v1 = v0->unk_24.unk_0C; + MapObject * v1 = v0->unk_24.unk_0C; VecFx32 v2 = {0, 0, 0}; sub_020630AC(v1, &v2); @@ -137,7 +137,7 @@ static void ov5_021F26F0 (UnkStruct_ov101_021D5D90 * param0, void * param1) static void ov5_021F2708 (UnkStruct_ov101_021D5D90 * param0, void * param1) { UnkStruct_ov5_021F26F0 * v0 = param1; - LocalMapObject * v1 = v0->unk_24.unk_0C; + MapObject * v1 = v0->unk_24.unk_0C; if (sub_02062764(v1, v0->unk_0C, v0->unk_10) == 0) { ov5_021DF74C(param0); diff --git a/src/overlay005/ov5_021F2850.c b/src/overlay005/ov5_021F2850.c index 5286e8374d..f78a563c37 100644 --- a/src/overlay005/ov5_021F2850.c +++ b/src/overlay005/ov5_021F2850.c @@ -34,7 +34,7 @@ typedef struct { UnkStruct_ov5_021DF47C * unk_04; FieldSystem * unk_08; UnkStruct_ov5_021F2874 * unk_0C; - LocalMapObject * unk_10; + MapObject * unk_10; } UnkStruct_ov5_021F28F4; typedef struct { @@ -115,7 +115,7 @@ static void ov5_021F28E4 (UnkStruct_ov5_021F2874 * param0) } } -UnkStruct_ov101_021D5D90 * ov5_021F28F4 (LocalMapObject * param0, int param1, int param2, int param3, int param4) +UnkStruct_ov101_021D5D90 * ov5_021F28F4 (MapObject * param0, int param1, int param2, int param3, int param4) { int v0; UnkStruct_ov101_021D5D90 * v1; @@ -175,7 +175,7 @@ static void ov5_021F29BC (UnkStruct_ov101_021D5D90 * param0, void * param1) static void ov5_021F29D0 (UnkStruct_ov101_021D5D90 * param0, void * param1) { UnkStruct_ov5_021F2974 * v0 = param1; - LocalMapObject * v1 = v0->unk_10.unk_10; + MapObject * v1 = v0->unk_10.unk_10; if (v0->unk_0C == 0) { return; diff --git a/src/overlay005/ov5_021F2A7C.c b/src/overlay005/ov5_021F2A7C.c index ee6f544c23..89a2b6615e 100644 --- a/src/overlay005/ov5_021F2A7C.c +++ b/src/overlay005/ov5_021F2A7C.c @@ -70,7 +70,7 @@ static void ov5_021F2AD0 (UnkStruct_ov5_021F2AA8 * param0) sub_02073AA8(¶m0->unk_18); } -void ov5_021F2AE4 (LocalMapObject * param0, int param1, int param2, int param3) +void ov5_021F2AE4 (MapObject * param0, int param1, int param2, int param3) { int v0, v1; UnkStruct_ov5_021F2AE4 v2; diff --git a/src/overlay005/ov5_021F2BD0.c b/src/overlay005/ov5_021F2BD0.c index 332245b9ea..bf60b1b62e 100644 --- a/src/overlay005/ov5_021F2BD0.c +++ b/src/overlay005/ov5_021F2BD0.c @@ -70,7 +70,7 @@ static void ov5_021F2C24 (UnkStruct_ov5_021F2BFC * param0) sub_02073AA8(¶m0->unk_18); } -void ov5_021F2C38 (LocalMapObject * param0, int param1, int param2, int param3) +void ov5_021F2C38 (MapObject * param0, int param1, int param2, int param3) { int v0, v1; UnkStruct_ov5_021F2C38 v2; diff --git a/src/overlay005/ov5_021F2D20.c b/src/overlay005/ov5_021F2D20.c index 0449fc52e5..9853090fe5 100644 --- a/src/overlay005/ov5_021F2D20.c +++ b/src/overlay005/ov5_021F2D20.c @@ -28,7 +28,7 @@ typedef struct { FieldSystem * unk_0C; UnkStruct_ov5_021DF47C * unk_10; UnkStruct_ov5_021F2D20 * unk_14; - LocalMapObject * unk_18; + MapObject * unk_18; } UnkStruct_021F2EA4; typedef struct { @@ -147,7 +147,7 @@ static void ov5_021F2E2C (UnkStruct_ov5_021F2D20 * param0) ov5_021DF9D4(param0->unk_00, 7); } -void ov5_021F2EA4 (LocalMapObject * param0, int param1) +void ov5_021F2EA4 (MapObject * param0, int param1) { int v0; VecFx32 v1; @@ -217,7 +217,7 @@ static void ov5_021F2FAC (UnkStruct_ov101_021D5D90 * param0, void * param1) { int v0; UnkStruct_021F2FA0 * v1; - LocalMapObject * v2; + MapObject * v2; v1 = param1; v2 = v1->unk_18.unk_18; @@ -281,7 +281,7 @@ static void ov5_021F308C (UnkStruct_ov101_021D5D90 * param0, void * param1) { VecFx32 v0; UnkStruct_021F2FA0 * v1; - LocalMapObject * v2; + MapObject * v2; v1 = param1; v2 = v1->unk_18.unk_18; diff --git a/src/overlay005/ov5_021F3284.c b/src/overlay005/ov5_021F3284.c index a4c8cd877b..f2b8bf1110 100644 --- a/src/overlay005/ov5_021F3284.c +++ b/src/overlay005/ov5_021F3284.c @@ -24,7 +24,7 @@ typedef struct { FieldSystem * unk_00; UnkStruct_ov5_021DF47C * unk_04; UnkStruct_ov5_021F32B0 * unk_08; - LocalMapObject * unk_0C; + MapObject * unk_0C; } UnkStruct_ov5_021F331C; typedef struct { @@ -78,7 +78,7 @@ static void ov5_021F32F4 (UnkStruct_ov5_021F32B0 * param0) ov5_021DF9D4(param0->unk_00, 3); } -void ov5_021F331C (LocalMapObject * param0, int param1) +void ov5_021F331C (MapObject * param0, int param1) { UnkStruct_ov5_021F331C v0; UnkStruct_ov5_021DF47C * v1; @@ -131,7 +131,7 @@ static void ov5_021F33D0 (UnkStruct_ov101_021D5D90 * param0, void * param1) { int v0, v1; UnkStruct_ov5_021F336C * v2; - LocalMapObject * v3; + MapObject * v3; v2 = param1; v3 = v2->unk_14.unk_0C; @@ -171,7 +171,7 @@ static void ov5_021F3448 (UnkStruct_ov101_021D5D90 * param0, void * param1) { VecFx32 v0; UnkStruct_ov5_021F336C * v1; - LocalMapObject * v2; + MapObject * v2; v1 = param1; v2 = v1->unk_14.unk_0C; diff --git a/src/overlay005/ov5_021F348C.c b/src/overlay005/ov5_021F348C.c index 8715e8f414..18afbe6afa 100644 --- a/src/overlay005/ov5_021F348C.c +++ b/src/overlay005/ov5_021F348C.c @@ -26,7 +26,7 @@ typedef struct { FieldSystem * unk_00; UnkStruct_ov5_021DF47C * unk_04; UnkStruct_ov5_021F34D0 * unk_08; - LocalMapObject * unk_0C; + MapObject * unk_0C; } UnkStruct_ov5_021F35E8; typedef struct { @@ -112,7 +112,7 @@ static void ov5_021F358C (UnkStruct_ov5_021F34D0 * param0) } } -static void ov5_021F35E8 (UnkStruct_ov5_021DF47C * param0, LocalMapObject * param1, UnkStruct_ov5_021F35E8 * param2, VecFx32 * param3, int * param4) +static void ov5_021F35E8 (UnkStruct_ov5_021DF47C * param0, MapObject * param1, UnkStruct_ov5_021F35E8 * param2, VecFx32 * param3, int * param4) { param2->unk_00 = sub_02062C00(param1); param2->unk_04 = param0; @@ -125,7 +125,7 @@ static void ov5_021F35E8 (UnkStruct_ov5_021DF47C * param0, LocalMapObject * para *param4 = sub_02062758(param1, 2); } -void ov5_021F3638 (LocalMapObject * param0) +void ov5_021F3638 (MapObject * param0) { int v0; UnkStruct_ov5_021DF47C * v1; @@ -139,7 +139,7 @@ void ov5_021F3638 (LocalMapObject * param0) v2 = ov5_021DF72C(v1, &Unk_ov5_022005C4, &v3, 0, &v4, v0); } -void ov5_021F3678 (LocalMapObject * param0, int param1) +void ov5_021F3678 (MapObject * param0, int param1) { int v0; UnkStruct_ov5_021DF47C * v1; @@ -219,7 +219,7 @@ static void ov5_021F3760 (UnkStruct_ov101_021D5D90 * param0, void * param1) { int v0; UnkStruct_ov5_021F36F4 * v1; - LocalMapObject * v2; + MapObject * v2; v1 = param1; v2 = v1->unk_10.unk_0C; @@ -241,7 +241,7 @@ static void ov5_021F3790 (UnkStruct_ov101_021D5D90 * param0, void * param1) { VecFx32 v0, v1; UnkStruct_ov5_021F36F4 * v2; - LocalMapObject * v3; + MapObject * v3; v2 = param1; v3 = v2->unk_10.unk_0C; diff --git a/src/overlay005/ov5_021F37A8.c b/src/overlay005/ov5_021F37A8.c index 359711fe0b..99ee0dbf5a 100644 --- a/src/overlay005/ov5_021F37A8.c +++ b/src/overlay005/ov5_021F37A8.c @@ -28,7 +28,7 @@ typedef struct { FieldSystem * unk_0C; UnkStruct_ov5_021DF47C * unk_10; UnkStruct_ov5_021F37D4 * unk_14; - LocalMapObject * unk_18; + MapObject * unk_18; } UnkStruct_ov5_021F3844; typedef struct { @@ -83,7 +83,7 @@ static void ov5_021F381C (UnkStruct_ov5_021F37D4 * param0) ov5_021DF9D4(param0->unk_00, 9); } -void ov5_021F3844 (LocalMapObject * param0, int param1) +void ov5_021F3844 (MapObject * param0, int param1) { int v0; VecFx32 v1; @@ -153,7 +153,7 @@ static void ov5_021F394C (UnkStruct_ov101_021D5D90 * param0, void * param1) { int v0; UnkStruct_ov5_021F38AC * v1; - LocalMapObject * v2; + MapObject * v2; v1 = param1; v2 = v1->unk_18.unk_18; @@ -211,7 +211,7 @@ static void ov5_021F3A18 (UnkStruct_ov101_021D5D90 * param0, void * param1) { VecFx32 v0; UnkStruct_ov5_021F38AC * v1; - LocalMapObject * v2; + MapObject * v2; v1 = param1; v2 = v1->unk_18.unk_18; diff --git a/src/overlay005/ov5_021F3A50.c b/src/overlay005/ov5_021F3A50.c index 9f139ccf58..f3b8f055e4 100644 --- a/src/overlay005/ov5_021F3A50.c +++ b/src/overlay005/ov5_021F3A50.c @@ -28,7 +28,7 @@ typedef struct { FieldSystem * unk_0C; UnkStruct_ov5_021DF47C * unk_10; UnkStruct_ov5_021F3A7C * unk_14; - LocalMapObject * unk_18; + MapObject * unk_18; } UnkStruct_ov5_021F3AEC; typedef struct { @@ -83,7 +83,7 @@ static void ov5_021F3AC4 (UnkStruct_ov5_021F3A7C * param0) ov5_021DF9D4(param0->unk_00, 10); } -void ov5_021F3AEC (LocalMapObject * param0, int param1) +void ov5_021F3AEC (MapObject * param0, int param1) { int v0; VecFx32 v1; @@ -154,7 +154,7 @@ static void ov5_021F3C00 (UnkStruct_ov101_021D5D90 * param0, void * param1) { int v0; UnkStruct_ov5_021F3B54 * v1; - LocalMapObject * v2; + MapObject * v2; v1 = param1; v2 = v1->unk_18.unk_18; @@ -212,7 +212,7 @@ static void ov5_021F3CCC (UnkStruct_ov101_021D5D90 * param0, void * param1) { VecFx32 v0; UnkStruct_ov5_021F3B54 * v1; - LocalMapObject * v2; + MapObject * v2; v1 = param1; v2 = v1->unk_18.unk_18; diff --git a/src/overlay005/ov5_021F3D00.c b/src/overlay005/ov5_021F3D00.c index 8dbc8b6ad5..94e97543a0 100644 --- a/src/overlay005/ov5_021F3D00.c +++ b/src/overlay005/ov5_021F3D00.c @@ -28,7 +28,7 @@ typedef struct { int unk_00; UnkStruct_ov5_021DF47C * unk_04; UnkStruct_ov5_021F3D2C * unk_08; - LocalMapObject * unk_0C; + MapObject * unk_0C; UnkStruct_02073B50 * unk_10; } UnkStruct_ov5_021F3D90; @@ -90,7 +90,7 @@ static UnkStruct_02073B50 * ov5_021F3D84 (UnkStruct_ov5_021F3D2C * param0, int p return ¶m0->unk_54[param1]; } -UnkStruct_ov101_021D5D90 * ov5_021F3D90 (LocalMapObject * param0, int param1) +UnkStruct_ov101_021D5D90 * ov5_021F3D90 (MapObject * param0, int param1) { VecFx32 v0; UnkStruct_ov101_021D5D90 * v1; @@ -128,7 +128,7 @@ static int ov5_021F3E00 (UnkStruct_ov101_021D5D90 * param0, void * param1) { UnkStruct_ov5_021F3E00 * v0 = param1; const UnkStruct_ov5_021F3D90 * v1 = sub_020715BC(param0); - LocalMapObject * v2 = v1->unk_0C; + MapObject * v2 = v1->unk_0C; v0->unk_10 = *v1; v0->unk_08 = sub_02062910(v2); @@ -140,7 +140,7 @@ static int ov5_021F3E00 (UnkStruct_ov101_021D5D90 * param0, void * param1) static void ov5_021F3E30 (UnkStruct_ov101_021D5D90 * param0, void * param1) { UnkStruct_ov5_021F3E00 * v0 = param1; - LocalMapObject * v1 = v0->unk_10.unk_0C; + MapObject * v1 = v0->unk_10.unk_0C; if (sub_02062764(v1, v0->unk_08, v0->unk_0C) == 1) { sub_0206A218(v1, NULL); diff --git a/src/overlay005/ov5_021F3E74.c b/src/overlay005/ov5_021F3E74.c index 18a4c00ba6..7ce1a1b51f 100644 --- a/src/overlay005/ov5_021F3E74.c +++ b/src/overlay005/ov5_021F3E74.c @@ -25,7 +25,7 @@ typedef struct { FieldSystem * unk_00; UnkStruct_ov5_021DF47C * unk_04; UnkStruct_ov5_021F3EA0 * unk_08; - LocalMapObject * unk_0C; + MapObject * unk_0C; } UnkStruct_ov5_021F3F10; typedef struct { @@ -79,7 +79,7 @@ static void ov5_021F3EE8 (UnkStruct_ov5_021F3EA0 * param0) ov5_021DF9D4(param0->unk_00, 11); } -void ov5_021F3F10 (LocalMapObject * param0) +void ov5_021F3F10 (MapObject * param0) { UnkStruct_ov5_021F3F10 v0; UnkStruct_ov5_021DF47C * v1; @@ -133,7 +133,7 @@ static void ov5_021F3FC4 (UnkStruct_ov101_021D5D90 * param0, void * param1) { int v0; UnkStruct_ov5_021F3FB8 * v1; - LocalMapObject * v2; + MapObject * v2; v1 = param1; v2 = v1->unk_10.unk_0C; @@ -155,7 +155,7 @@ static void ov5_021F3FF4 (UnkStruct_ov101_021D5D90 * param0, void * param1) { VecFx32 v0, v1; UnkStruct_ov5_021F3FB8 * v2; - LocalMapObject * v3; + MapObject * v3; v2 = param1; v3 = v2->unk_10.unk_0C; diff --git a/src/overlay005/ov5_021F47B0.c b/src/overlay005/ov5_021F47B0.c index 1fdfbea8a9..66db6b3fdc 100644 --- a/src/overlay005/ov5_021F47B0.c +++ b/src/overlay005/ov5_021F47B0.c @@ -29,7 +29,7 @@ typedef struct { int unk_00; UnkStruct_ov5_021DF47C * unk_04; UnkStruct_021F47DC * unk_08; - const LocalMapObject * unk_0C; + const MapObject * unk_0C; } UnkStruct_ov5_021F4840; typedef struct { @@ -57,7 +57,7 @@ static void ov5_021F4820(UnkStruct_021F47DC * param0); static void ov5_021F49D0(UnkStruct_ov101_021D5D90 * param0, UnkStruct_021F487C * param1); static void ov5_021F4A24(UnkStruct_ov101_021D5D90 * param0, UnkStruct_021F487C * param1); static void ov5_021F4A80(u16 * param0, s16 param1); -static int ov5_021F4AB4(const LocalMapObject * param0, int param1, VecFx32 * param2); +static int ov5_021F4AB4(const MapObject * param0, int param1, VecFx32 * param2); static void ov5_021F4B6C(int param0, int param1, const VecFx32 * param2, const VecFx32 * param3, VecFx32 * param4, VecFx32 * param5); static const UnkStruct_ov101_021D86B0 Unk_ov5_02200754; @@ -115,7 +115,7 @@ static void ov5_021F4820 (UnkStruct_021F47DC * param0) } } -UnkStruct_ov101_021D5D90 * ov5_021F4840 (UnkStruct_ov5_021DF47C * param0, const LocalMapObject * param1, int param2, int param3) +UnkStruct_ov101_021D5D90 * ov5_021F4840 (UnkStruct_ov5_021DF47C * param0, const MapObject * param1, int param2, int param3) { int v0; UnkStruct_ov101_021D5D90 * v1; @@ -163,7 +163,7 @@ static void ov5_021F4908 (UnkStruct_ov101_021D5D90 * param0, void * param1) VecFx32 v1, v2; const VecFx32 * v3; UnkStruct_021F487C * v4 = param1; - const LocalMapObject * v5 = v4->unk_24.unk_0C; + const MapObject * v5 = v4->unk_24.unk_0C; int v6 = sub_0206298C(v5); sub_02063050(v5, &v2); @@ -218,7 +218,7 @@ static const UnkStruct_ov101_021D86B0 Unk_ov5_02200754 = { static void ov5_021F49D0 (UnkStruct_ov101_021D5D90 * param0, UnkStruct_021F487C * param1) { VecFx32 v0; - const LocalMapObject * v1 = param1->unk_24.unk_0C; + const MapObject * v1 = param1->unk_24.unk_0C; param1->unk_1C = Unk_ov5_0220077C[param1->unk_00]; sub_02063050(param1->unk_24.unk_0C, &v0); @@ -233,7 +233,7 @@ static void ov5_021F49D0 (UnkStruct_ov101_021D5D90 * param0, UnkStruct_021F487C static void ov5_021F4A24 (UnkStruct_ov101_021D5D90 * param0, UnkStruct_021F487C * param1) { VecFx32 v0; - const LocalMapObject * v1 = param1->unk_24.unk_0C; + const MapObject * v1 = param1->unk_24.unk_0C; param1->unk_10 = Unk_ov5_022007C0[param1->unk_00][param1->unk_01]; param1->unk_04 = Unk_ov5_022008E0[param1->unk_00][param1->unk_01]; @@ -254,7 +254,7 @@ static void ov5_021F4A80 (u16 * param0, s16 param1) } } -static int ov5_021F4AB4 (const LocalMapObject * param0, int param1, VecFx32 * param2) +static int ov5_021F4AB4 (const MapObject * param0, int param1, VecFx32 * param2) { u32 v0; VecFx32 v1; @@ -277,7 +277,7 @@ static int ov5_021F4AB4 (const LocalMapObject * param0, int param1, VecFx32 * pa if ((v0 != 0) && (v0 != (1 << 0))) { if (v0 == (1 << 2)) { - LocalMapObject * v7; + MapObject * v7; v7 = sub_0206326C(sub_02062A40(param0), v4, v6, 1); GF_ASSERT(v7 != NULL); diff --git a/src/overlay005/ov5_021F50BC.c b/src/overlay005/ov5_021F50BC.c index 14fd5434d8..0da7fb6500 100644 --- a/src/overlay005/ov5_021F50BC.c +++ b/src/overlay005/ov5_021F50BC.c @@ -22,13 +22,13 @@ typedef struct { UnkStruct_ov5_021DF47C * unk_08; UnkStruct_02073838 unk_0C; UnkStruct_02073B50 unk_20; - LocalMapObject * unk_74; + MapObject * unk_74; } UnkStruct_021F50E8; typedef struct { UnkStruct_ov5_021DF47C * unk_00; UnkStruct_021F50E8 * unk_04; - LocalMapObject * unk_08; + MapObject * unk_08; } UnkStruct_ov5_021F511C; typedef struct { @@ -78,7 +78,7 @@ static void ov5_021F5110 (UnkStruct_021F50E8 * param0) sub_0207395C(¶m0->unk_0C); } -UnkStruct_ov101_021D5D90 * ov5_021F511C (LocalMapObject * param0) +UnkStruct_ov101_021D5D90 * ov5_021F511C (MapObject * param0) { int v0, v1; UnkStruct_ov5_021F511C v2; @@ -128,7 +128,7 @@ static void ov5_021F51A0 (UnkStruct_ov101_021D5D90 * param0, void * param1) static void ov5_021F51A4 (UnkStruct_ov101_021D5D90 * param0, void * param1) { UnkStruct_ov5_021F5158 * v0; - LocalMapObject * v1; + MapObject * v1; VecFx32 v2; v0 = param1; diff --git a/src/overlay005/ov5_021F5284.c b/src/overlay005/ov5_021F5284.c index 2677b61287..dc273f00dc 100644 --- a/src/overlay005/ov5_021F5284.c +++ b/src/overlay005/ov5_021F5284.c @@ -22,13 +22,13 @@ typedef struct { UnkStruct_ov5_021DF47C * unk_08; UnkStruct_02073838 unk_0C; UnkStruct_02073B50 unk_20; - LocalMapObject * unk_74; + MapObject * unk_74; } UnkStruct_021F52B0; typedef struct { UnkStruct_ov5_021DF47C * unk_00; UnkStruct_021F52B0 * unk_04; - LocalMapObject * unk_08; + MapObject * unk_08; } UnkStruct_021F52E4; typedef struct { @@ -79,7 +79,7 @@ static void ov5_021F52D8 (UnkStruct_021F52B0 * param0) sub_0207395C(¶m0->unk_0C); } -UnkStruct_ov101_021D5D90 * ov5_021F52E4 (LocalMapObject * param0) +UnkStruct_ov101_021D5D90 * ov5_021F52E4 (MapObject * param0) { int v0, v1; UnkStruct_021F52E4 v2; @@ -130,7 +130,7 @@ static void ov5_021F5368 (UnkStruct_ov101_021D5D90 * param0, void * param1) static void ov5_021F536C (UnkStruct_ov101_021D5D90 * param0, void * param1) { UnkStruct_021F5320 * v0; - LocalMapObject * v1; + MapObject * v1; VecFx32 v2; v0 = param1; diff --git a/src/overlay005/ov5_021F5428.c b/src/overlay005/ov5_021F5428.c index 8081f416e7..cc4d0a71ee 100644 --- a/src/overlay005/ov5_021F5428.c +++ b/src/overlay005/ov5_021F5428.c @@ -22,13 +22,13 @@ typedef struct { UnkStruct_ov5_021DF47C * unk_08; UnkStruct_02073838 unk_0C; UnkStruct_02073B50 unk_20; - LocalMapObject * unk_74; + MapObject * unk_74; } UnkStruct_ov5_021F5454; typedef struct { UnkStruct_ov5_021DF47C * unk_00; UnkStruct_ov5_021F5454 * unk_04; - LocalMapObject * unk_08; + MapObject * unk_08; } UnkStruct_ov5_021F5488; typedef struct { @@ -79,7 +79,7 @@ static void ov5_021F547C (UnkStruct_ov5_021F5454 * param0) sub_0207395C(¶m0->unk_0C); } -UnkStruct_ov101_021D5D90 * ov5_021F5488 (LocalMapObject * param0) +UnkStruct_ov101_021D5D90 * ov5_021F5488 (MapObject * param0) { int v0, v1; UnkStruct_ov5_021F5488 v2; @@ -132,7 +132,7 @@ static void ov5_021F5510 (UnkStruct_ov101_021D5D90 * param0, void * param1) static void ov5_021F5514 (UnkStruct_ov101_021D5D90 * param0, void * param1) { UnkStruct_ov5_021F54C4 * v0; - LocalMapObject * v1; + MapObject * v1; VecFx32 v2; v0 = param1; diff --git a/src/overlay005/ov5_021F5894.c b/src/overlay005/ov5_021F5894.c index 0b87bd476b..c39408caa4 100644 --- a/src/overlay005/ov5_021F5894.c +++ b/src/overlay005/ov5_021F5894.c @@ -69,7 +69,7 @@ static void ov5_021F58E8 (UnkStruct_021F58C0 * param0) sub_02073AA8(¶m0->unk_18); } -void ov5_021F58FC (LocalMapObject * param0, int param1, int param2, int param3) +void ov5_021F58FC (MapObject * param0, int param1, int param2, int param3) { int v0, v1, v2; UnkStruct_021F58FC v3; diff --git a/src/overlay005/ov5_021F5A10.c b/src/overlay005/ov5_021F5A10.c index ce50b52602..7ac8346a68 100644 --- a/src/overlay005/ov5_021F5A10.c +++ b/src/overlay005/ov5_021F5A10.c @@ -34,7 +34,7 @@ typedef struct { int unk_00; UnkStruct_ov5_021DF47C * unk_04; UnkStruct_ov5_021F5A34 * unk_08; - LocalMapObject * unk_0C; + MapObject * unk_0C; } UnkStruct_ov5_021F5D8C; typedef struct { @@ -353,7 +353,7 @@ static void ov5_021F5D54 (UnkStruct_ov101_021D5D90 * param0, void * param1) sub_020212A8(v1->unk_40, &v0); } -UnkStruct_ov101_021D5D90 * ov5_021F5D8C (LocalMapObject * param0, int param1, int param2, int param3) +UnkStruct_ov101_021D5D90 * ov5_021F5D8C (MapObject * param0, int param1, int param2, int param3) { int v0; UnkStruct_ov5_021F5D8C v1; @@ -412,7 +412,7 @@ static int ov5_021F5DE4 (UnkStruct_ov101_021D5D90 * param0, void * param1) static void ov5_021F5E58 (UnkStruct_ov101_021D5D90 * param0, void * param1) { UnkStruct_ov5_021F5C4C * v0; - LocalMapObject * v1; + MapObject * v1; VecFx32 v2; v0 = param1; @@ -475,7 +475,7 @@ static int ov5_021F5EE0 (UnkStruct_ov101_021D5D90 * param0, void * param1) static void ov5_021F5F24 (UnkStruct_ov101_021D5D90 * param0, void * param1) { UnkStruct_ov5_021F5C4C * v0; - LocalMapObject * v1; + MapObject * v1; VecFx32 v2; v0 = param1; diff --git a/src/overlay005/ov5_021F600C.c b/src/overlay005/ov5_021F600C.c index dcefd4dce0..c665a1bb5a 100644 --- a/src/overlay005/ov5_021F600C.c +++ b/src/overlay005/ov5_021F600C.c @@ -24,7 +24,7 @@ typedef struct { FieldSystem * unk_00; UnkStruct_ov5_021DF47C * unk_04; UnkStruct_ov5_021F600C * unk_08; - LocalMapObject * unk_0C; + MapObject * unk_0C; } UnkStruct_ov5_021F6094; typedef struct { @@ -75,7 +75,7 @@ static void ov5_021F6074 (UnkStruct_ov5_021F600C * param0) ov5_021DF9D4(param0->unk_00, 4); } -UnkStruct_ov101_021D5D90 * ov5_021F6094 (LocalMapObject * param0) +UnkStruct_ov101_021D5D90 * ov5_021F6094 (MapObject * param0) { UnkStruct_ov5_021F6094 v0; UnkStruct_ov5_021DF47C * v1; @@ -128,7 +128,7 @@ static void ov5_021F6134 (UnkStruct_ov101_021D5D90 * param0, void * param1) static void ov5_021F6140 (UnkStruct_ov101_021D5D90 * param0, void * param1) { UnkStruct_ov5_021F6134 * v0; - LocalMapObject * v1; + MapObject * v1; v0 = param1; v1 = v0->unk_10.unk_0C; @@ -143,7 +143,7 @@ static void ov5_021F615C (UnkStruct_ov101_021D5D90 * param0, void * param1) { VecFx32 v0, v1; UnkStruct_ov5_021F6134 * v2; - LocalMapObject * v3; + MapObject * v3; v2 = param1; v3 = v2->unk_10.unk_0C; diff --git a/src/overlay005/ov5_021F61BC.c b/src/overlay005/ov5_021F61BC.c index a42d236c5c..7a5e90881c 100644 --- a/src/overlay005/ov5_021F61BC.c +++ b/src/overlay005/ov5_021F61BC.c @@ -88,10 +88,10 @@ void ov5_021F6218 (PlayerAvatar * param0) int v0 = 0, v1; UnkStruct_021F6218 v2; UnkStruct_ov5_021DF47C * v3; - LocalMapObject * v4; + MapObject * v4; VecFx32 v5 = {0, 0, 0}; - v4 = Player_LocalMapObject(param0); + v4 = Player_MapObject(param0); v3 = ov5_021DF578(v4); v2.unk_00 = v3; @@ -105,13 +105,13 @@ void ov5_021F6218 (PlayerAvatar * param0) static int ov5_021F6264 (UnkStruct_ov101_021D5D90 * param0, void * param1) { UnkStruct_021F6264 * v0; - LocalMapObject * v1; + MapObject * v1; const UnkStruct_021F6218 * v2; v0 = param1; v2 = sub_020715BC(param0); v0->unk_24 = *v2; - v1 = Player_LocalMapObject(v2->unk_08); + v1 = Player_MapObject(v2->unk_08); v0->unk_04 = -1; v0->unk_14 = sub_02062910(v1); @@ -130,7 +130,7 @@ static void ov5_021F62A0 (UnkStruct_ov101_021D5D90 * param0, void * param1) int v0; UnkStruct_021F6264 * v1 = param1; PlayerAvatar * v2 = v1->unk_24.unk_08; - LocalMapObject * v3 = Player_LocalMapObject(v2); + MapObject * v3 = Player_MapObject(v2); if (sub_02062764(v3, v1->unk_14, v1->unk_18) == 0) { ov5_021DF74C(param0); diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index a33227b310..f3b7268932 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -985,15 +985,15 @@ BOOL ScrCmd_32D (ScriptContext * param0) int v3 = 0; FieldSystem * v4 = param0->fieldSys; MapObjectManager * v5 = v4->unk_38; - LocalMapObject * v6 = Player_LocalMapObject(v4->playerAvatar); - LocalMapObject * v7; + MapObject * v6 = Player_MapObject(v4->playerAvatar); + MapObject * v7; sub_02063050(v6, &v1); v0 = v1.y; while (sub_020625B0(v5, &v7, &v3, (1 << 0)) == 1) { if (v7 != v6) { - sub_020628BC(v7, (1 << 13)); + MapObject_SetFlagOn(v7, (1 << 13)); if (sub_020628D8(v7, (1 << 12)) == 1) { sub_02063050(v7, &v1); @@ -1026,24 +1026,24 @@ BOOL ScrCmd_32E (ScriptContext * param0) int v0 = 0; FieldSystem * v1 = param0->fieldSys; MapObjectManager * v2 = v1->unk_38; - LocalMapObject * v3 = Player_LocalMapObject(v1->playerAvatar); - LocalMapObject * v4; + MapObject * v3 = Player_MapObject(v1->playerAvatar); + MapObject * v4; while (sub_020625B0(v2, &v4, &v0, (1 << 0)) == 1) { if (v4 != v3) { - sub_020628C4(v4, (1 << 13)); + MapObject_SetFlagOff(v4, (1 << 13)); } } return 0; } -static void ov5_021F7654 (LocalMapObject * param0, int param1) +static void ov5_021F7654 (MapObject * param0, int param1) { VecFx32 v0; UnkStruct_020216E0 * v1; - sub_020628BC(param0, (1 << 13)); + MapObject_SetFlagOn(param0, (1 << 13)); sub_02063050(param0, &v0); v0.y = (((param1) << 4) * FX32_ONE); @@ -1061,7 +1061,7 @@ static void ov5_021F7654 (LocalMapObject * param0, int param1) BOOL ScrCmd_331 (ScriptContext * param0) { - LocalMapObject * v0; + MapObject * v0; FieldSystem * v1 = param0->fieldSys; MapObjectManager * v2 = v1->unk_38; @@ -1082,19 +1082,19 @@ BOOL ScrCmd_331 (ScriptContext * param0) BOOL ScrCmd_332 (ScriptContext * param0) { - LocalMapObject * v0; + MapObject * v0; MapObjectManager * v1 = param0->fieldSys->unk_38; v0 = MapObjMan_LocalMapObjByIndex(v1, 32); if (v0 != NULL) { - sub_020628C4(v0, (1 << 13)); + MapObject_SetFlagOff(v0, (1 << 13)); } v0 = MapObjMan_LocalMapObjByIndex(v1, 2); if (v0 != NULL) { - sub_020628C4(v0, (1 << 13)); + MapObject_SetFlagOff(v0, (1 << 13)); } return 0; @@ -1103,7 +1103,7 @@ BOOL ScrCmd_332 (ScriptContext * param0) BOOL ScrCmd_338 (ScriptContext * param0) { int v0; - LocalMapObject * v1 = MapObjMan_LocalMapObjByIndex(param0->fieldSys->unk_38, 15); + MapObject * v1 = MapObjMan_LocalMapObjByIndex(param0->fieldSys->unk_38, 15); if (v1 != NULL) { switch (sub_02063020(v1)) @@ -1131,9 +1131,9 @@ BOOL ScrCmd_338 (ScriptContext * param0) BOOL ScrCmd_339 (ScriptContext * param0) { - LocalMapObject * v0 = MapObjMan_LocalMapObjByIndex(param0->fieldSys->unk_38, 15); + MapObject * v0 = MapObjMan_LocalMapObjByIndex(param0->fieldSys->unk_38, 15); if (v0 != NULL) - sub_020628C4(v0, 8192); + MapObject_SetFlagOff(v0, 8192); return 0; } diff --git a/src/overlay005/ov5_021F8560.c b/src/overlay005/ov5_021F8560.c index 76adff76cd..1010158bf8 100644 --- a/src/overlay005/ov5_021F8560.c +++ b/src/overlay005/ov5_021F8560.c @@ -31,7 +31,7 @@ typedef struct { int unk_04; UnkStruct_ov5_021DF47C * unk_08; UnkStruct_ov5_021F858C * unk_0C; - LocalMapObject * unk_10; + MapObject * unk_10; PlayerAvatar * unk_14; } UnkStruct_ov5_021F8668; @@ -98,9 +98,9 @@ UnkStruct_ov101_021D5D90 * ov5_021F85BC (PlayerAvatar * param0, int param1, int const VecFx32 * v2; VecFx32 v3 = {0, 0, 0}; UnkStruct_ov5_021F8668 v4; - LocalMapObject * v5; + MapObject * v5; - v5 = Player_LocalMapObject(param0); + v5 = Player_MapObject(param0); v4.unk_00 = param4; v4.unk_04 = param6; @@ -132,7 +132,7 @@ static int ov5_021F8668 (UnkStruct_ov101_021D5D90 * param0, void * param1) { UnkStruct_ov5_021F86CC * v0 = param1; const UnkStruct_ov5_021F8668 * v1 = sub_020715BC(param0); - LocalMapObject * v2 = v1->unk_10; + MapObject * v2 = v1->unk_10; v0->unk_38 = *v1; v0->unk_04 = v1->unk_00; @@ -153,7 +153,7 @@ static int ov5_021F8668 (UnkStruct_ov101_021D5D90 * param0, void * param1) static void ov5_021F86CC (UnkStruct_ov101_021D5D90 * param0, void * param1) { UnkStruct_ov5_021F86CC * v0 = param1; - LocalMapObject * v1 = v0->unk_38.unk_10; + MapObject * v1 = v0->unk_38.unk_10; VecFx32 v2 = {0, 0, 0}; sub_020630AC(v1, &v2); @@ -162,7 +162,7 @@ static void ov5_021F86CC (UnkStruct_ov101_021D5D90 * param0, void * param1) static void ov5_021F86E4 (UnkStruct_ov101_021D5D90 * param0, void * param1) { UnkStruct_ov5_021F86CC * v0 = param1; - LocalMapObject * v1 = v0->unk_38.unk_10; + MapObject * v1 = v0->unk_38.unk_10; PlayerAvatar * v2 = v0->unk_38.unk_14; if (((v0)->unk_00 & (1 << 1)) == 0) { diff --git a/src/overlay006/ov6_0223E140.c b/src/overlay006/ov6_0223E140.c index f59672a22b..914d8baf6e 100644 --- a/src/overlay006/ov6_0223E140.c +++ b/src/overlay006/ov6_0223E140.c @@ -140,9 +140,9 @@ typedef struct { UnkStruct_ov6_0223FD0C unk_E4; UnkStruct_ov6_0223FD0C unk_F4; FieldSystem * unk_104; - LocalMapObject * unk_108; - LocalMapObject * unk_10C; - LocalMapObject * unk_110; + MapObject * unk_108; + MapObject * unk_10C; + MapObject * unk_110; PlayerAvatar * unk_114; } UnkStruct_ov6_0223EA98; @@ -195,7 +195,7 @@ typedef struct UnkStruct_ov6_022400A8_t { } UnkStruct_ov6_022400A8; typedef struct { - LocalMapObject * unk_00; + MapObject * unk_00; UnkStruct_ov6_0223FD0C unk_04; UnkStruct_ov6_0223FD0C unk_14; int unk_24; @@ -498,14 +498,14 @@ static void ov6_0223E2FC (SysTask * param0, void * param1) static void ov6_0223E318 (FieldSystem * param0, u32 param1, BOOL param2) { - LocalMapObject * v0; + MapObject * v0; v0 = MapObjMan_LocalMapObjByIndex(param0->unk_38, param1); if (param2 == 1) { - sub_020628BC(v0, (1 << 20)); + MapObject_SetFlagOn(v0, (1 << 20)); } else { - sub_020628C4(v0, (1 << 20)); + MapObject_SetFlagOff(v0, (1 << 20)); } } @@ -836,7 +836,7 @@ static BOOL ov6_0223E71C (UnkStruct_ov6_0223E71C * param0) static void ov6_0223E7B4 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2) { UnkStruct_ov6_0223E7B4 * v0 = param2; - LocalMapObject * v1; + MapObject * v1; u16 v2, v3, v4; v1 = MapObjMan_LocalMapObjByIndex(param1->unk_38, 0); @@ -1092,7 +1092,7 @@ static void ov6_0223EB4C (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, v0->unk_104 = param1; v0->unk_108 = MapObjMan_LocalMapObjByIndex(v0->unk_104->unk_38, 1); v0->unk_10C = MapObjMan_LocalMapObjByIndex(v0->unk_104->unk_38, 0); - v0->unk_110 = Player_LocalMapObject(sub_0205EF3C(v0->unk_104)); + v0->unk_110 = Player_MapObject(sub_0205EF3C(v0->unk_104)); Heap_FndInitAllocatorForExpHeap(&v0->unk_C0, 4, 32); ov6_0223EA98(v0); @@ -2824,7 +2824,7 @@ UnkStruct_ov6_02240C44 * ov6_02240B9C (u32 param0, FieldSystem * param1) void ov6_02240C44 (UnkStruct_ov6_02240C44 * param0, u32 param1) { VecFx32 v0; - LocalMapObject * v1; + MapObject * v1; v1 = MapObjMan_LocalMapObjByIndex(param0->unk_D8->unk_38, param1); diff --git a/src/overlay006/ov6_02242AF0.c b/src/overlay006/ov6_02242AF0.c index 751c55a804..908872b45b 100644 --- a/src/overlay006/ov6_02242AF0.c +++ b/src/overlay006/ov6_02242AF0.c @@ -295,10 +295,10 @@ static BOOL ov6_02242D94 (FieldSystem * param0, UnkStruct_ov6_02242B58 * param1, static BOOL ov6_02242E60 (FieldSystem * param0, UnkStruct_ov6_02242B58 * param1, const fx32 * param2, VecFx32 * param3) { - LocalMapObject * v0; + MapObject * v0; VecFx32 v1; - v0 = Player_LocalMapObject(param0->playerAvatar); + v0 = Player_MapObject(param0->playerAvatar); sub_0205EAEC(param0->playerAvatar, &v1); param3->z = v1.z + ((FX32_ONE * 16) / 2); diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c index 838d4443bf..d63c254731 100644 --- a/src/overlay006/ov6_02243258.c +++ b/src/overlay006/ov6_02243258.c @@ -246,7 +246,7 @@ typedef struct { VecFx32 unk_18; fx32 unk_24; fx32 unk_28; - LocalMapObject * unk_2C; + MapObject * unk_2C; UnkStruct_ov6_02243FFC * unk_30; } UnkStruct_ov100_021D4890; @@ -1026,7 +1026,7 @@ static void ov6_02243F50 (void) static void ov6_02243F74 (FieldSystem * param0, int param1) { - LocalMapObject * v0 = Player_LocalMapObject(param0->playerAvatar); + MapObject * v0 = Player_MapObject(param0->playerAvatar); sub_02062D64(v0, param1); } @@ -3042,7 +3042,7 @@ static void * ov6_02245F44 (u32 param0, int param1) static void ov6_02245F64 (UnkStruct_ov6_02243FFC * param0, int param1) { - LocalMapObject * v0 = Player_LocalMapObject(param0->unk_60->playerAvatar); + MapObject * v0 = Player_MapObject(param0->unk_60->playerAvatar); sub_02062DDC(v0); sub_02062D64(v0, param1); diff --git a/src/overlay006/ov6_02247100.c b/src/overlay006/ov6_02247100.c index c73291ddbc..c2f5c7c738 100644 --- a/src/overlay006/ov6_02247100.c +++ b/src/overlay006/ov6_02247100.c @@ -32,7 +32,7 @@ typedef struct { SysTask * unk_0C; SysTask * unk_10; SysTask * unk_14; - LocalMapObject * unk_18; + MapObject * unk_18; FieldSystem * unk_1C; Pokemon * unk_20; } UnkStruct_ov6_02247100; @@ -54,7 +54,7 @@ void * ov6_02247100 (FieldSystem * param0, u32 param1) v0->unk_08 = 0; v0->unk_1C = param0; - v0->unk_18 = Player_LocalMapObject(param0->playerAvatar); + v0->unk_18 = Player_MapObject(param0->playerAvatar); return v0; } @@ -174,7 +174,7 @@ void * ov6_022472C8 (FieldSystem * param0, u32 param1, int param2) v0->unk_08 = param2; v0->unk_1C = param0; - v0->unk_18 = Player_LocalMapObject(param0->playerAvatar); + v0->unk_18 = Player_MapObject(param0->playerAvatar); return v0; } @@ -293,7 +293,7 @@ void * ov6_02247488 (FieldSystem * param0, Pokemon * param1, u32 param2) v0->unk_08 = 1; v0->unk_1C = param0; - v0->unk_18 = Player_LocalMapObject(param0->playerAvatar); + v0->unk_18 = Player_MapObject(param0->playerAvatar); v0->unk_20 = param1; return v0; @@ -352,7 +352,7 @@ void * ov6_02247530 (FieldSystem * param0, Pokemon * param1, u32 param2) v0->unk_08 = 2; v0->unk_1C = param0; - v0->unk_18 = Player_LocalMapObject(param0->playerAvatar); + v0->unk_18 = Player_MapObject(param0->playerAvatar); v0->unk_20 = param1; return v0; diff --git a/src/overlay006/ov6_02248050.c b/src/overlay006/ov6_02248050.c index 128a268b23..eeb3a5cf92 100644 --- a/src/overlay006/ov6_02248050.c +++ b/src/overlay006/ov6_02248050.c @@ -73,7 +73,7 @@ static void ov6_02248050 (MapObjectManager * param0, u32 param1, UnkStruct_02017 int v0; int v1, v2; VecFx32 v3; - LocalMapObject * v4; + MapObject * v4; v4 = MapObjMan_LocalMapObjByIndex(param0, param1); diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c index 39066d2064..aed68fe24c 100644 --- a/src/overlay008/ov8_02249960.c +++ b/src/overlay008/ov8_02249960.c @@ -172,7 +172,7 @@ typedef struct { int unk_14; int unk_18; int unk_1C; - LocalMapObject * unk_20; + MapObject * unk_20; } UnkStruct_ov8_0224B28C; typedef struct { @@ -198,7 +198,7 @@ typedef struct { typedef struct { int unk_00; int unk_04; - LocalMapObject * unk_08; + MapObject * unk_08; UnkStruct_ov101_021D5D90 * unk_0C; } UnkStruct_ov8_0224B80C; @@ -233,7 +233,7 @@ typedef struct { int unk_24; int unk_28; int unk_2C; - LocalMapObject * unk_30; + MapObject * unk_30; FieldSystem * unk_34; } UnkStruct_ov8_0224C0C4; @@ -289,7 +289,7 @@ typedef struct { int unk_08; SysTask * unk_0C; UnkStruct_ov101_021D5D90 * unk_10; - LocalMapObject * unk_14; + MapObject * unk_14; UnkStruct_ov8_0224C444 * unk_18; } UnkStruct_ov8_0224C4F8; @@ -1413,13 +1413,13 @@ static BOOL ov8_0224A4FC (TaskManager * param0) static BOOL ov8_0224A620 (TaskManager * param0) { UnkStruct_ov5_021E1890 * v0; - LocalMapObject * v1; + MapObject * v1; FieldSystem * v2 = TaskManager_FieldSystem(param0); UnkStruct_ov8_0224997C * v3 = TaskManager_Environment(param0); UnkStruct_ov8_0224A1E4 * v4; v4 = (UnkStruct_ov8_0224A1E4 *)v2->unk_04->unk_24; - v1 = Player_LocalMapObject(v2->playerAvatar); + v1 = Player_MapObject(v2->playerAvatar); switch (v3->unk_00) { case 0: @@ -1497,13 +1497,13 @@ static BOOL ov8_0224A620 (TaskManager * param0) static BOOL ov8_0224A770 (TaskManager * param0) { UnkStruct_ov5_021E1890 * v0; - LocalMapObject * v1; + MapObject * v1; FieldSystem * v2 = TaskManager_FieldSystem(param0); UnkStruct_ov8_0224997C * v3 = TaskManager_Environment(param0); UnkStruct_ov8_0224A1E4 * v4; v4 = (UnkStruct_ov8_0224A1E4 *)v2->unk_04->unk_24; - v1 = Player_LocalMapObject(v2->playerAvatar); + v1 = Player_MapObject(v2->playerAvatar); switch (v3->unk_00) { case 0: @@ -1566,9 +1566,9 @@ static BOOL ov8_0224A770 (TaskManager * param0) break; case 3: { - LocalMapObject * v8; + MapObject * v8; - v8 = Player_LocalMapObject(v2->playerAvatar); + v8 = Player_MapObject(v2->playerAvatar); if (LocalMapObj_CheckAnimationFinished(v8) == 1) { sub_020656AC(v8); @@ -2731,12 +2731,12 @@ static void ov8_0224B2C4 (FieldSystem * param0, UnkStruct_ov8_0224B28C * param1) ov5_021E931C(v0, param0->unk_28); sub_02020690(v0, param0->unk_24); - LocalMapObj_Delete(param1->unk_20); + MapObject_Delete(param1->unk_20); } static BOOL ov8_0224B2E8 (UnkStruct_ov8_0224B28C * param0) { - LocalMapObject * v0 = param0->unk_20; + MapObject * v0 = param0->unk_20; if (LocalMapObj_IsAnimationSet(param0->unk_20) == 1) { int v1 = 0x9a; @@ -3136,9 +3136,9 @@ BOOL ov8_0224B7D4 (FieldSystem * param0, const int param1, const int param2, con return 0; } -static LocalMapObject * ov8_0224B7D8 (FieldSystem * param0, int param1, int param2, int param3) +static MapObject * ov8_0224B7D8 (FieldSystem * param0, int param1, int param2, int param3) { - LocalMapObject * v0; + MapObject * v0; v0 = sub_020619DC(param0->unk_38, param1, param2, 0, 0x2000, 0x0, param0->unk_1C->unk_00); @@ -3148,7 +3148,7 @@ static LocalMapObject * ov8_0224B7D8 (FieldSystem * param0, int param1, int para return v0; } -static void ov8_0224B80C (UnkStruct_ov8_0224B80C * param0, LocalMapObject * param1, FieldSystem * param2) +static void ov8_0224B80C (UnkStruct_ov8_0224B80C * param0, MapObject * param1, FieldSystem * param2) { param0->unk_08 = param1; param0->unk_00 = sub_02063020(param1); @@ -3204,7 +3204,7 @@ static void ov8_0224B8A0 (UnkStruct_ov8_0224B8A0 * param0) GF_ASSERT(param0->unk_08.unk_08); sub_0207136C(param0->unk_08.unk_0C); - LocalMapObj_Delete(param0->unk_08.unk_08); + MapObject_Delete(param0->unk_08.unk_08); param0->unk_00 = 0; } @@ -3212,7 +3212,7 @@ static void ov8_0224B8A0 (UnkStruct_ov8_0224B8A0 * param0) static void ov8_0224B8D0 (UnkStruct_ov8_0224B8D0 * param0) { int v0; - LocalMapObject * v1; + MapObject * v1; const UnkStruct_ov8_0224C90C * v2; FieldSystem * v3 = param0->unk_00; UnkStruct_ov8_0224B8A0 * v4 = param0->unk_04; @@ -3237,7 +3237,7 @@ static void ov8_0224B8D0 (UnkStruct_ov8_0224B8D0 * param0) static void ov8_0224B958 (UnkStruct_ov8_0224B8D0 * param0) { int v0 = 0, v1 = 0; - LocalMapObject * v2; + MapObject * v2; FieldSystem * v3 = param0->unk_00; MapObjectManager * v4 = v3->unk_38; UnkStruct_ov8_0224B8A0 * v5 = param0->unk_04; @@ -3341,12 +3341,12 @@ static u32 ov8_0224BAA0 (UnkStruct_ov8_0224B8D0 * param0, int param1, int param2 static BOOL ov8_0224BAF4 (TaskManager * param0) { - LocalMapObject * v0; + MapObject * v0; FieldSystem * v1 = TaskManager_FieldSystem(param0); UnkStruct_ov8_0224C098 * v2 = TaskManager_Environment(param0); UnkStruct_ov8_0224B8D0 * v3 = v2->unk_3C; - v0 = Player_LocalMapObject(v1->playerAvatar); + v0 = Player_MapObject(v1->playerAvatar); switch (v2->unk_00) { case 0: @@ -3404,9 +3404,9 @@ static int ov8_0224BBA0 (UnkStruct_ov8_0224C098 * param0) static int ov8_0224BBD0 (UnkStruct_ov8_0224C098 * param0) { - LocalMapObject * v0; + MapObject * v0; - v0 = Player_LocalMapObject(param0->unk_3C->unk_00->playerAvatar); + v0 = Player_MapObject(param0->unk_3C->unk_00->playerAvatar); if (LocalMapObj_IsAnimationSet(v0) == 0) { return 0; @@ -3584,9 +3584,9 @@ static int ov8_0224BE8C (UnkStruct_ov8_0224C098 * param0) static int ov8_0224BEA4 (UnkStruct_ov8_0224C098 * param0) { - LocalMapObject * v0; + MapObject * v0; - v0 = Player_LocalMapObject(param0->unk_3C->unk_00->playerAvatar); + v0 = Player_MapObject(param0->unk_3C->unk_00->playerAvatar); if (LocalMapObj_CheckAnimationFinished(v0) == 1) { sub_020656AC(v0); @@ -3729,7 +3729,7 @@ static void ov8_0224C098 (UnkStruct_ov8_0224C098 * param0) ov5_021E931C(v1, v0->unk_34->unk_28); sub_02020690(v1, v0->unk_34->unk_24); - LocalMapObj_Delete(v0->unk_30); + MapObject_Delete(v0->unk_30); } static BOOL ov8_0224C0C4 (UnkStruct_ov8_0224C098 * param0) @@ -3897,7 +3897,7 @@ void ov8_0224C198 (FieldSystem * param0) { int v3 = 0xd2; PlayerAvatar * v4 = param0->playerAvatar; - LocalMapObject * v5 = Player_LocalMapObject(v4); + MapObject * v5 = Player_MapObject(v4); if (sub_0205EB98(param0->playerAvatar) == 1) { v3 = 0xd3; @@ -4020,7 +4020,7 @@ static void ov8_0224C3B4 (UnkStruct_ov8_0224C444 * param0) static void ov8_0224C444 (UnkStruct_ov8_0224C444 * param0) { int v0, v1, v2, v3, v4; - LocalMapObject * v5; + MapObject * v5; UnkStruct_ov8_0224C4F8 * v6 = param0->unk_04; const MapObjectManager * v7 = param0->unk_00->unk_38; @@ -4077,8 +4077,8 @@ BOOL ov8_0224C51C (FieldSystem * param0) UnkStruct_02027860 * v4; PlayerAvatar * v5; MapObjectManager * v6; - LocalMapObject * v7; - LocalMapObject * v8; + MapObject * v7; + MapObject * v8; v4 = sub_02027860(FieldSystem_SaveData(param0)); @@ -4090,7 +4090,7 @@ BOOL ov8_0224C51C (FieldSystem * param0) v7 = NULL; v6 = param0->unk_38; v5 = param0->playerAvatar; - v8 = Player_LocalMapObject(v5); + v8 = Player_MapObject(v5); v2 = 2; v1 = sub_0206447C(sub_0206298C(v8)); @@ -4122,7 +4122,7 @@ BOOL ov8_0224C5DC (FieldSystem * param0, void * param1) } { - LocalMapObject * v1 = param1; + MapObject * v1 = param1; sub_02062FF4(v1, sub_02063020(v1)); sub_02063004(v1, sub_02063040(v1)); diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c index 2aa04e5c28..f4204c2fe2 100644 --- a/src/overlay009/ov9_02249960.c +++ b/src/overlay009/ov9_02249960.c @@ -322,7 +322,7 @@ typedef struct { NNSG3dAnmObj * unk_10; u16 unk_14; u16 unk_16; - LocalMapObject * unk_18; + MapObject * unk_18; UnkStruct_020216E0 * unk_1C; } UnkStruct_ov9_0224A294; @@ -443,7 +443,7 @@ typedef struct { u8 unk_01; u16 unk_02; UnkStruct_ov9_0224DF10 unk_04; - LocalMapObject * unk_1C; + MapObject * unk_1C; UnkStruct_ov101_021D5D90 * unk_20; } UnkStruct_ov9_0224E0DC; @@ -505,7 +505,7 @@ typedef struct { } UnkStruct_ov9_02252EB4; typedef struct { - LocalMapObject * unk_00[19]; + MapObject * unk_00[19]; } UnkStruct_ov9_0224EE40; typedef struct { @@ -672,7 +672,7 @@ typedef struct { fx32 unk_5C; u32 unk_60; UnkStruct_ov9_0224E0DC * unk_64; - LocalMapObject * unk_68; + MapObject * unk_68; SysTask * unk_6C; } UnkStruct_ov9_0224D078; @@ -735,7 +735,7 @@ struct UnkStruct_ov9_0224F6EC_t { UnkStruct_ov9_02249B04 * unk_00; FieldSystem * unk_04; TaskManager * unk_08; - LocalMapObject * unk_0C; + MapObject * unk_0C; u16 unk_10; u16 unk_12; u32 unk_14; @@ -835,7 +835,7 @@ typedef struct { fx32 unk_04; VecFx32 unk_08; int unk_14; - LocalMapObject * unk_18; + MapObject * unk_18; u16 unk_1C[16]; } UnkStruct_ov9_0225074C; @@ -846,14 +846,14 @@ typedef struct { fx32 unk_0C; fx32 unk_10; VecFx32 unk_14; - LocalMapObject * unk_20; + MapObject * unk_20; } UnkStruct_ov9_02250918; typedef struct { fx32 unk_00; VecFx32 unk_04; SysTask * unk_10; - LocalMapObject * unk_14; + MapObject * unk_14; } UnkStruct_ov9_02250AFC; typedef struct { @@ -861,7 +861,7 @@ typedef struct { VecFx32 unk_04; SysTask * unk_10; SysTask * unk_14; - LocalMapObject * unk_18; + MapObject * unk_18; } UnkStruct_ov9_02250C14; typedef struct { @@ -912,12 +912,12 @@ static void ov9_0224A228(UnkStruct_ov9_0224A228 * param0, UnkStruct_ov9_0224A294 static void ov9_0224A294(UnkStruct_ov9_0224A228 * param0, UnkStruct_ov9_0224A294 * param1); static void ov9_0224A2AC(UnkStruct_ov9_0224A228 * param0, UnkStruct_ov9_0224A294 * param1); static void ov9_0224A334(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224A390(UnkStruct_ov9_02249B04 * param0, LocalMapObject * param1, int param2); +static void ov9_0224A390(UnkStruct_ov9_02249B04 * param0, MapObject * param1, int param2); static void ov9_0224A3C4(UnkStruct_ov9_02249B04 * param0, UnkStruct_020216E0 * param1, int param2); static void ov9_0224A408(UnkStruct_ov9_02249B04 * param0, const UnkStruct_020216E0 * param1); static void ov9_0224A49C(UnkStruct_ov9_02249B04 * param0); static void ov9_0224A4C8(UnkStruct_020216E0 * param0, void * param1); -static void ov9_0224A4D0(UnkStruct_ov9_02249B04 * param0, LocalMapObject * param1, int param2, int param3); +static void ov9_0224A4D0(UnkStruct_ov9_02249B04 * param0, MapObject * param1, int param2, int param3); static void ov9_0224A570(UnkStruct_ov9_02249B04 * param0); static void ov9_0224A574(UnkStruct_ov9_02249B04 * param0); static void * ov9_0224A578(UnkStruct_ov9_02249B04 * param0, int param1); @@ -928,7 +928,7 @@ static void ov9_0224A9E8(UnkStruct_ov9_02249B04 * param0); static BOOL ov9_0224AA00(UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, int param4); static void ov9_0224AA34(UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0224AA00 * param1); static BOOL ov9_0224AAD4(TaskManager * param0); -static BOOL ov9_0224AC58(UnkStruct_ov9_0224AC58 * param0, LocalMapObject * param1); +static BOOL ov9_0224AC58(UnkStruct_ov9_0224AC58 * param0, MapObject * param1); static void ov9_0224ADC0(UnkStruct_ov9_02249B04 * param0); static void ov9_0224AED8(UnkStruct_ov9_02249B04 * param0); static void ov9_0224AEE4(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224B064 * param1, NARC * param2); @@ -1076,8 +1076,8 @@ static UnkStruct_ov9_0224E0DC * ov9_0224DE08(UnkStruct_ov9_02249B04 * param0, u3 static const UnkStruct_ov9_02252C38 * ov9_0224DE40(u32 param0); static const UnkStruct_ov9_0224DF10 * ov9_0224DE60(u32 param0, u32 param1); static const UnkStruct_ov9_02253830 * ov9_0224DE70(u32 param0); -static LocalMapObject * ov9_0224DE94(UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, int param4, int param5, u32 param6); -static void ov9_0224DF10(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1, LocalMapObject * param2); +static MapObject * ov9_0224DE94(UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, int param4, int param5, u32 param6); +static void ov9_0224DF10(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1, MapObject * param2); static UnkStruct_ov101_021D5D90 * ov9_0224DFA0(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1); static void ov9_0224DFF4(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1, const UnkStruct_ov9_0224DF10 * param2, u32 param3); static void ov9_0224E044(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1); @@ -1120,15 +1120,15 @@ static BOOL ov9_0224ECE8(UnkStruct_ov9_02249B04 * param0, u32 param1); static BOOL ov9_0224ED20(UnkStruct_ov9_02249B04 * param0, u32 param1); static void ov9_0224EE40(UnkStruct_ov9_02249B04 * param0); static void ov9_0224EE6C(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224EE70(UnkStruct_ov9_02249B04 * param0, LocalMapObject * param1); -static LocalMapObject ** ov9_0224EEA0(UnkStruct_ov9_02249B04 * param0); +static void ov9_0224EE70(UnkStruct_ov9_02249B04 * param0, MapObject * param1); +static MapObject ** ov9_0224EEA0(UnkStruct_ov9_02249B04 * param0); static BOOL ov9_0224EF30(UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0224EF30 * param1, u16 param2); -static BOOL ov9_0224EF64(UnkStruct_ov9_02249B04 * param0, LocalMapObject ** param1, const UnkStruct_ov9_0224EF30 * param2, u32 param3, u16 param4); +static BOOL ov9_0224EF64(UnkStruct_ov9_02249B04 * param0, MapObject ** param1, const UnkStruct_ov9_0224EF30 * param2, u32 param3, u16 param4); static BOOL ov9_0224F048(UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0224EF30 ** param1, u32 param2); static void ov9_0224F078(UnkStruct_ov9_02249B04 * param0, u32 param1); static void ov9_0224F0A4(UnkStruct_ov9_02249B04 * param0, u32 param1); -static LocalMapObject * ov9_0224F0D4(UnkStruct_ov9_02249B04 * param0, u32 param1, u16 param2); -static BOOL ov9_0224F1CC(UnkStruct_ov9_02249B04 * param0, LocalMapObject * param1); +static MapObject * ov9_0224F0D4(UnkStruct_ov9_02249B04 * param0, u32 param1, u16 param2); +static BOOL ov9_0224F1CC(UnkStruct_ov9_02249B04 * param0, MapObject * param1); static void ov9_0224F724(UnkStruct_ov9_02249B04 * param0); static void ov9_0224F760(UnkStruct_ov9_02249B04 * param0); static void ov9_0224F764(UnkStruct_ov9_02249B04 * param0); @@ -1145,7 +1145,7 @@ static u32 ov9_022510D0(UnkStruct_ov9_02249B04 * param0); static int ov9_022510D8(u32 param0); static BOOL ov9_02251104(UnkStruct_ov9_02249B04 * param0, u32 param1, u32 param2); static void ov9_022511E0(u16 param0); -static void ov9_022511F4(LocalMapObject * param0, const VecFx32 * param1); +static void ov9_022511F4(MapObject * param0, const VecFx32 * param1); static const UnkStruct_ov101_021D86B0 Unk_ov9_02251508; static const UnkStruct_ov101_021D86B0 Unk_ov9_02251468; @@ -1846,7 +1846,7 @@ static void ov9_0224A334 (UnkStruct_ov9_02249B04 * param0) v1->unk_04 = NULL; } -static void ov9_0224A374 (UnkStruct_ov9_0224A294 * param0, LocalMapObject * param1, int param2) +static void ov9_0224A374 (UnkStruct_ov9_0224A294 * param0, MapObject * param1, int param2) { param0->unk_00 = param2; param0->unk_04 = (FX32_ONE * (param2)); @@ -1858,7 +1858,7 @@ static void ov9_0224A374 (UnkStruct_ov9_0224A294 * param0, LocalMapObject * para } } -static void ov9_0224A390 (UnkStruct_ov9_02249B04 * param0, LocalMapObject * param1, int param2) +static void ov9_0224A390 (UnkStruct_ov9_02249B04 * param0, MapObject * param1, int param2) { int v0 = 0; UnkStruct_ov9_0224A228 * v1 = ¶m0->unk_188; @@ -1966,7 +1966,7 @@ static void ov9_0224A4C8 (UnkStruct_020216E0 * param0, void * param1) NNS_G3dAnmObjSetFrame(v0->unk_10, v0->unk_0C); } -static void ov9_0224A4D0 (UnkStruct_ov9_02249B04 * param0, LocalMapObject * param1, int param2, int param3) +static void ov9_0224A4D0 (UnkStruct_ov9_02249B04 * param0, MapObject * param1, int param2, int param3) { int v0 = 0; UnkStruct_ov9_0224A228 * v1 = ¶m0->unk_188; @@ -1988,7 +1988,7 @@ static void ov9_0224A4D0 (UnkStruct_ov9_02249B04 * param0, LocalMapObject * para GF_ASSERT(0); } -int ov9_0224A520 (FieldSystem * param0, LocalMapObject * param1) +int ov9_0224A520 (FieldSystem * param0, MapObject * param1) { int v0 = 0; UnkStruct_ov9_02249B04 * v1 = param0->unk_04->unk_24; @@ -2242,7 +2242,7 @@ static void ov9_0224A8C0 (UnkStruct_ov9_02249B04 * param0) int v2, v3, v4, v5; int v6[6] = {0, 0, 0, 90, 270, 180}; PlayerAvatar * v7 = param0->unk_00->playerAvatar; - LocalMapObject * v8 = Player_LocalMapObject(v7); + MapObject * v8 = Player_MapObject(v7); ov9_02250F44(param0, &v2, &v3, &v4); @@ -2317,7 +2317,7 @@ static BOOL ov9_0224AA00 (UnkStruct_ov9_02249B04 * param0, int param1, int param v0 = ov9_0224C69C(param0, param1, param2, param3, param4); if (v0) { - LocalMapObject * v1 = Player_LocalMapObject(param0->unk_00->playerAvatar); + MapObject * v1 = Player_MapObject(param0->unk_00->playerAvatar); Unk_ov9_02251224[v0->unk_00](param0, v0); return 1; @@ -2362,7 +2362,7 @@ static BOOL ov9_0224AAD4 (TaskManager * param0) UnkStruct_ov9_02249B04 * v1 = TaskManager_Environment(param0); UnkStruct_ov9_0224AC58 * v2 = ov9_0224A598(v1); PlayerAvatar * v3 = v0->playerAvatar; - LocalMapObject * v4 = Player_LocalMapObject(v3); + MapObject * v4 = Player_MapObject(v3); switch (v2->unk_00) { case 0: @@ -2422,7 +2422,7 @@ static BOOL ov9_0224AAD4 (TaskManager * param0) { int v11 = 1; int v12 = 0; - LocalMapObject * v13 = Player_LocalMapObject(v3); + MapObject * v13 = Player_MapObject(v3); ov9_0224C3F8(v1, v2->unk_34.unk_26); v11 = ov9_022510D8(v2->unk_34.unk_24); @@ -2469,7 +2469,7 @@ static BOOL ov9_0224AAD4 (TaskManager * param0) return 0; } -static BOOL ov9_0224AC58 (UnkStruct_ov9_0224AC58 * param0, LocalMapObject * param1) +static BOOL ov9_0224AC58 (UnkStruct_ov9_0224AC58 * param0, MapObject * param1) { const UnkStruct_ov9_0224AA00 * v0 = ¶m0->unk_34; @@ -3352,7 +3352,7 @@ static void ov9_0224BA6C (UnkStruct_ov101_021D5D90 * param0, void * param1) int v6 = 0; int v7 = ((v2->unk_08.unk_08) * 2); const MapObjectManager * v8 = v2->unk_14->unk_00->unk_38; - LocalMapObject * v9; + MapObject * v9; while (sub_020625B0( v8, &v9, &v6, (1 << 0)) == 1) { @@ -4424,7 +4424,7 @@ static void ov9_0224C8E8 (UnkStruct_ov9_02249B04 * param0) if (ov9_02249D38(param0) == 0) { VecFx32 v12, v13; - LocalMapObject * v14 = Player_LocalMapObject(v3->playerAvatar); + MapObject * v14 = Player_MapObject(v3->playerAvatar); sub_02063050(v14, &v13); ov5_021EA6BC(v3->unk_28, &v12); @@ -4949,7 +4949,7 @@ static BOOL ov9_0224D098 (TaskManager * param0) static int ov9_0224D0C8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 * param1) { u32 v0; - LocalMapObject * v1; + MapObject * v1; const UnkStruct_ov9_022530A4 * v2; const UnkStruct_ov9_02253830 * v3; @@ -4994,7 +4994,7 @@ static int ov9_0224D0C8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 } v3 = ov9_0224DE70(param1->unk_02); - v1 = Player_LocalMapObject(param0->unk_00->playerAvatar); + v1 = Player_MapObject(param0->unk_00->playerAvatar); sub_02063050(v1, ¶m1->unk_14); sub_02062E28(v1, 1); @@ -5050,7 +5050,7 @@ static int ov9_0224D288 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 { VecFx32 v0; PlayerAvatar * v1 = param0->unk_00->playerAvatar; - LocalMapObject * v2 = Player_LocalMapObject(v1); + MapObject * v2 = Player_MapObject(v1); VecFx32 * v3 = ov9_0224E330(param1->unk_64->unk_20); sub_0206309C(v2, &v0); @@ -5111,7 +5111,7 @@ static int ov9_0224D374 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 { int v0; PlayerAvatar * v1 = param0->unk_00->playerAvatar; - LocalMapObject * v2 = Player_LocalMapObject(v1); + MapObject * v2 = Player_MapObject(v1); VecFx32 * v3 = ov9_0224E330(param1->unk_64->unk_20); if (param1->unk_44.x != param1->unk_2C.x) { @@ -5193,7 +5193,7 @@ static int ov9_0224D4C4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 { int v0; PlayerAvatar * v1 = param0->unk_00->playerAvatar; - LocalMapObject * v2 = Player_LocalMapObject(v1); + MapObject * v2 = Player_MapObject(v1); VecFx32 * v3 = ov9_0224E330(param1->unk_64->unk_20); if (param1->unk_44.x != param1->unk_2C.x) { @@ -5229,7 +5229,7 @@ static int ov9_0224D4C4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 sub_020057A4(1481, 0); param1->unk_04 = 5; } else { - LocalMapObject * v5 = Player_LocalMapObject(param0->unk_00->playerAvatar); + MapObject * v5 = Player_MapObject(param0->unk_00->playerAvatar); LocalMapObj_SetX(v5, param1->unk_0A); sub_02063034(v5, param1->unk_0C); @@ -5260,7 +5260,7 @@ static int ov9_0224D4C4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 static int ov9_0224D5E8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 * param1) { if (ov9_0224CC7C(param0) == 0) { - LocalMapObject * v0 = Player_LocalMapObject(param0->unk_00->playerAvatar); + MapObject * v0 = Player_MapObject(param0->unk_00->playerAvatar); LocalMapObj_SetX(v0, param1->unk_0A); sub_02063034(v0, param1->unk_0C); @@ -5323,7 +5323,7 @@ static const UnkStruct_ov5_021F8E3C * const Unk_ov9_02251384[3] = { static int ov9_0224D69C (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 * param1) { int v0; - LocalMapObject * v1; + MapObject * v1; const UnkStruct_ov5_021F8E3C * v2; v1 = MapObjMan_LocalMapObjByIndex(param0->unk_00->unk_38, (0x80 + 6)); @@ -5343,7 +5343,7 @@ static int ov9_0224D6E0 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 { if (sub_0206574C(param1->unk_6C) == 1) { UnkStruct_020507E4 * v0; - LocalMapObject * v1; + MapObject * v1; sub_02065758(param1->unk_6C); v1 = MapObjMan_LocalMapObjByIndex(param0->unk_00->unk_38, (0x80 + 6)); @@ -5711,7 +5711,7 @@ static void ov9_0224DCA8 (UnkStruct_ov9_02249B04 * param0) if (ov9_02249D38(param0) == 1) { int v0 = 0; UnkStruct_ov9_0224E0DC * v1; - LocalMapObject * v2; + MapObject * v2; MapObjectManager * v3 = param0->unk_00->unk_38; while (sub_020625B0(v3, &v2, &v0, (1 << 0)) == 1) { @@ -5852,9 +5852,9 @@ static const UnkStruct_ov9_02253830 * ov9_0224DE70 (u32 param0) return NULL; } -static LocalMapObject * ov9_0224DE94 (UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, int param4, int param5, u32 param6) +static MapObject * ov9_0224DE94 (UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, int param4, int param5, u32 param6) { - LocalMapObject * v0; + MapObject * v0; v0 = sub_020619DC(param0->unk_00->unk_38, param1, param3, 0, 0x2000, 0x0, ov9_022510D0(param0)); @@ -5871,7 +5871,7 @@ static LocalMapObject * ov9_0224DE94 (UnkStruct_ov9_02249B04 * param0, int param return v0; } -static void ov9_0224DF10 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1, LocalMapObject * param2) +static void ov9_0224DF10 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1, MapObject * param2) { u32 v0, v1, v2, v3; const UnkStruct_ov9_0224DF10 * v4; @@ -5938,7 +5938,7 @@ static void ov9_0224E044 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0D static void ov9_0224E060 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1) { if (param1->unk_1C != NULL) { - LocalMapObj_Delete(param1->unk_1C); + MapObject_Delete(param1->unk_1C); } ov9_0224E044(param0, param1); @@ -5956,7 +5956,7 @@ static void ov9_0224E07C (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0D } { - LocalMapObject * v1 = param1->unk_1C; + MapObject * v1 = param1->unk_1C; LocalMapObj_SetX(v1, param1->unk_04.unk_02); sub_02063034(v1, param1->unk_04.unk_04); @@ -6320,7 +6320,7 @@ static int ov9_0224E4D8 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, static int ov9_0224E4E8 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) { - LocalMapObject * v0; + MapObject * v0; const UnkStruct_ov9_0224E4E8 * v1 = param3; UnkStruct_ov9_0224E4D8 * v2 = ov9_0224E39C(param0); @@ -6337,7 +6337,7 @@ static int ov9_0224E4E8 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, static int ov9_0224E520 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) { - LocalMapObject * v0; + MapObject * v0; const UnkStruct_ov9_0224E4E8 * v1 = param3; UnkStruct_ov9_0224E4D8 * v2 = ov9_0224E39C(param0); @@ -6380,7 +6380,7 @@ static int ov9_0224E550 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, if (v0->unk_02 == 1) { VecFx32 v3; - LocalMapObject * v4 = Player_LocalMapObject(param0->unk_00->playerAvatar); + MapObject * v4 = Player_MapObject(param0->unk_00->playerAvatar); sub_02062E28(v4, 1); sub_0206309C(v4, &v3); @@ -6396,13 +6396,13 @@ static int ov9_0224E550 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, static int ov9_0224E5EC (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) { - LocalMapObject * v0 = NULL; + MapObject * v0 = NULL; const UnkStruct_ov9_0224E550 * v1 = param3; UnkStruct_ov9_0224E5EC * v2 = ov9_0224E39C(param0); VecFx32 * v3 = ov9_0224E330(v2->unk_24->unk_20); if (v1->unk_02 == 1) { - v0 = Player_LocalMapObject(param0->unk_00->playerAvatar); + v0 = Player_MapObject(param0->unk_00->playerAvatar); } v3->y = v2->unk_2C + v2->unk_30; @@ -6488,7 +6488,7 @@ static int ov9_0224E6B0 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, if (v1->unk_02 == 1) { VecFx32 v4; - LocalMapObject * v5 = Player_LocalMapObject(param0->unk_00->playerAvatar); + MapObject * v5 = Player_MapObject(param0->unk_00->playerAvatar); sub_02063050(v5, &v4); @@ -6511,7 +6511,7 @@ static int ov9_0224E798 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, const UnkStruct_ov9_0224E550 * v0 = param3; if (v0->unk_02 == 1) { - LocalMapObject * v1 = Player_LocalMapObject(param0->unk_00->playerAvatar); + MapObject * v1 = Player_MapObject(param0->unk_00->playerAvatar); int v2 = sub_02063020(v1) + v0->unk_06; int v3 = sub_02063030(v1) + ((v0->unk_08) * 2); int v4 = sub_02063040(v1) + v0->unk_0A; @@ -7107,15 +7107,15 @@ static void ov9_0224EE6C (UnkStruct_ov9_02249B04 * param0) return; } -static void ov9_0224EE70 (UnkStruct_ov9_02249B04 * param0, LocalMapObject * param1) +static void ov9_0224EE70 (UnkStruct_ov9_02249B04 * param0, MapObject * param1) { int v0 = 0; UnkStruct_ov9_0224EE40 * v1 = ¶m0->unk_1C64; - LocalMapObject ** v2 = v1->unk_00; + MapObject ** v2 = v1->unk_00; for (v0 = 0; v0 < 19; v0++, v2++) { if ((*v2 != NULL) && (*v2 == param1)) { - LocalMapObj_Delete(*v2); + MapObject_Delete(*v2); *v2 = NULL; return; } @@ -7124,7 +7124,7 @@ static void ov9_0224EE70 (UnkStruct_ov9_02249B04 * param0, LocalMapObject * para GF_ASSERT(0); } -static LocalMapObject ** ov9_0224EEA0 (UnkStruct_ov9_02249B04 * param0) +static MapObject ** ov9_0224EEA0 (UnkStruct_ov9_02249B04 * param0) { int v0; UnkStruct_ov9_0224EE40 * v1 = ¶m0->unk_1C64; @@ -7139,10 +7139,10 @@ static LocalMapObject ** ov9_0224EEA0 (UnkStruct_ov9_02249B04 * param0) return NULL; } -static LocalMapObject * ov9_0224EECC (UnkStruct_ov9_02249B04 * param0, const UnkStruct_020619DC * param1, u32 param2) +static MapObject * ov9_0224EECC (UnkStruct_ov9_02249B04 * param0, const UnkStruct_020619DC * param1, u32 param2) { int v0 = 0; - LocalMapObject * v1; + MapObject * v1; const MapObjectManager * v2 = param0->unk_00->unk_38; while (sub_020625B0(v2, &v1, &v0, (1 << 0))) { @@ -7174,9 +7174,9 @@ static BOOL ov9_0224EF30 (UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0 return 1; } -static BOOL ov9_0224EF64 (UnkStruct_ov9_02249B04 * param0, LocalMapObject ** param1, const UnkStruct_ov9_0224EF30 * param2, u32 param3, u16 param4) +static BOOL ov9_0224EF64 (UnkStruct_ov9_02249B04 * param0, MapObject ** param1, const UnkStruct_ov9_0224EF30 * param2, u32 param3, u16 param4) { - LocalMapObject * v0; + MapObject * v0; v0 = ov9_0224EECC(param0, ¶m2->unk_08, param3); @@ -7204,7 +7204,7 @@ static BOOL ov9_0224EF64 (UnkStruct_ov9_02249B04 * param0, LocalMapObject ** par sub_02062FC4(*param1, 1); sub_02062E5C(*param1, 1); sub_02062E28(*param1, 1); - sub_020628BC(*param1, (1 << 13)); + MapObject_SetFlagOn(*param1, (1 << 13)); if (v0 == NULL) { UnkStruct_020216E0 * v1; @@ -7227,7 +7227,7 @@ static BOOL ov9_0224EF64 (UnkStruct_ov9_02249B04 * param0, LocalMapObject ** par static BOOL ov9_0224F048 (UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0224EF30 ** param1, u32 param2) { - LocalMapObject ** v0; + MapObject ** v0; while ((*param1) != NULL) { v0 = ov9_0224EEA0(param0); @@ -7256,21 +7256,21 @@ static void ov9_0224F0A4 (UnkStruct_ov9_02249B04 * param0, u32 param1) { int v0 = 0; UnkStruct_ov9_0224EE40 * v1 = ¶m0->unk_1C64; - LocalMapObject ** v2 = v1->unk_00; + MapObject ** v2 = v1->unk_00; for (v0 = 0; v0 < 19; v0++, v2++) { if ((*v2) != NULL) { if (sub_02062918(*v2) == param1) { - LocalMapObj_Delete(*v2); + MapObject_Delete(*v2); *v2 = NULL; } } } } -static LocalMapObject * ov9_0224F0D4 (UnkStruct_ov9_02249B04 * param0, u32 param1, u16 param2) +static MapObject * ov9_0224F0D4 (UnkStruct_ov9_02249B04 * param0, u32 param1, u16 param2) { - LocalMapObject ** v0 = NULL; + MapObject ** v0 = NULL; const UnkStruct_ov9_02252EB4 * v1 = Unk_ov9_02252EB4; while (v1->unk_00 != 593) { @@ -7316,7 +7316,7 @@ void ov9_0224F158 (FieldSystem * param0, u16 param1) void ov9_0224F16C (FieldSystem * param0, u16 param1) { int v0 = 0; - LocalMapObject * v1; + MapObject * v1; u32 v2 = param0->unk_1C->unk_00; MapObjectManager * v3 = param0->unk_38; UnkStruct_ov9_02249B04 * v4 = param0->unk_04->unk_24; @@ -7332,11 +7332,11 @@ void ov9_0224F16C (FieldSystem * param0, u16 param1) GF_ASSERT(0); } -static BOOL ov9_0224F1CC (UnkStruct_ov9_02249B04 * param0, LocalMapObject * param1) +static BOOL ov9_0224F1CC (UnkStruct_ov9_02249B04 * param0, MapObject * param1) { int v0 = 0; UnkStruct_ov9_0224EE40 * v1 = ¶m0->unk_1C64; - LocalMapObject ** v2 = v1->unk_00; + MapObject ** v2 = v1->unk_00; GF_ASSERT(param1 != NULL); @@ -7386,7 +7386,7 @@ static BOOL ov9_0224F1F8 (u32 param0, int param1, int param2, u32 * param3) return 0; } -BOOL ov9_0224F240 (const LocalMapObject * param0, int param1) +BOOL ov9_0224F240 (const MapObject * param0, int param1) { int v0, v1; u32 v2, v3; @@ -7402,7 +7402,7 @@ BOOL ov9_0224F240 (const LocalMapObject * param0, int param1) return ov9_0224F1F8(v3, v0, v1, &v2); } -static BOOL ov9_0224F284 (const LocalMapObject * param0, u32 * param1) +static BOOL ov9_0224F284 (const MapObject * param0, u32 * param1) { int v0, v1; u32 v2; @@ -7416,13 +7416,13 @@ static BOOL ov9_0224F284 (const LocalMapObject * param0, u32 * param1) return ov9_0224F1F8(v2, v0, v1, param1); } -BOOL ov9_0224F2B0 (const LocalMapObject * param0) +BOOL ov9_0224F2B0 (const MapObject * param0) { u32 v0; return ov9_0224F284(param0, &v0); } -UnkStruct_ov9_0224F6EC * ov9_0224F2BC (FieldSystem * param0, TaskManager * param1, LocalMapObject * param2) +UnkStruct_ov9_0224F6EC * ov9_0224F2BC (FieldSystem * param0, TaskManager * param1, MapObject * param2) { UnkStruct_ov9_0224F6EC * v0; @@ -7460,7 +7460,7 @@ static BOOL ov9_0224F324 (UnkStruct_ov9_0224F6EC * param0) { int v0; VecFx32 v1; - LocalMapObject * v2 = param0->unk_0C; + MapObject * v2 = param0->unk_0C; sub_02063050(v2, &v1); v1.y -= FX32_ONE * 8; @@ -7506,7 +7506,7 @@ static BOOL ov9_0224F3BC (UnkStruct_ov9_0224F6EC * param0) case 0: { VecFx32 v0; - LocalMapObject * v1 = param0->unk_0C; + MapObject * v1 = param0->unk_0C; sub_02063050(v1, &v0); v0.y -= FX32_ONE * 2; @@ -7526,7 +7526,7 @@ static BOOL ov9_0224F3BC (UnkStruct_ov9_0224F6EC * param0) case 1: { VecFx32 v2; - LocalMapObject * v3 = param0->unk_0C; + MapObject * v3 = param0->unk_0C; sub_02063050(v3, &v2); v2.y -= FX32_ONE * 4; @@ -7543,7 +7543,7 @@ static BOOL ov9_0224F3BC (UnkStruct_ov9_0224F6EC * param0) { u32 v4 = 0, v5 = 0; - LocalMapObject * v6 = param0->unk_0C; + MapObject * v6 = param0->unk_0C; ov9_02249DC8(param0->unk_00, param0->unk_14); @@ -7600,7 +7600,7 @@ static BOOL ov9_0224F3BC (UnkStruct_ov9_0224F6EC * param0) case 2: { VecFx32 v12; - LocalMapObject * v13 = param0->unk_0C; + MapObject * v13 = param0->unk_0C; sub_0206309C(v13, &v12); v12.y = param0->unk_1C + param0->unk_20; @@ -7621,7 +7621,7 @@ static BOOL ov9_0224F3BC (UnkStruct_ov9_0224F6EC * param0) { u32 v14 = 0, v15 = 0; - LocalMapObject * v16 = param0->unk_0C; + MapObject * v16 = param0->unk_0C; switch (param0->unk_14) { case 6: @@ -7675,7 +7675,7 @@ static BOOL ov9_0224F5D8 (UnkStruct_ov9_0224F6EC * param0) case 0: { VecFx32 v0; - LocalMapObject * v1 = param0->unk_0C; + MapObject * v1 = param0->unk_0C; sub_02063050(v1, &v0); v0.y -= FX32_ONE * 2; @@ -7695,7 +7695,7 @@ static BOOL ov9_0224F5D8 (UnkStruct_ov9_0224F6EC * param0) case 1: { VecFx32 v2; - LocalMapObject * v3 = param0->unk_0C; + MapObject * v3 = param0->unk_0C; sub_02063050(v3, &v2); v2.y -= FX32_ONE * 4; @@ -7714,7 +7714,7 @@ static BOOL ov9_0224F5D8 (UnkStruct_ov9_0224F6EC * param0) case 2: { VecFx32 v4; - LocalMapObject * v5 = param0->unk_0C; + MapObject * v5 = param0->unk_0C; sub_02063050(v5, &v4); v4.y -= FX32_ONE * 8; @@ -7729,7 +7729,7 @@ static BOOL ov9_0224F5D8 (UnkStruct_ov9_0224F6EC * param0) { u32 v6 = 0, v7 = 0, v8 = 0, v9 = 0; - LocalMapObject * v10 = param0->unk_0C; + MapObject * v10 = param0->unk_0C; switch (sub_02062910(v10)) { case (0x80 + 0): @@ -8024,7 +8024,7 @@ static const UnkStruct_ov9_0224A8A0 Unk_ov9_02251888 = { static void ov9_0224FA94 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224FA94 * param1) { - LocalMapObject * v0 = Player_LocalMapObject(param0->unk_00->playerAvatar); + MapObject * v0 = Player_MapObject(param0->unk_00->playerAvatar); int v1 = (((param1->unk_40.unk_10.y) >> 4) / FX32_ONE); if ((param1->unk_04 == 0) && (v1 == -20)) { @@ -8052,7 +8052,7 @@ static int ov9_0224FB3C (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, { VecFx32 v0; UnkStruct_ov9_0224F930 * v1; - LocalMapObject * v2; + MapObject * v2; PlayerAvatar * v3; UnkStruct_ov9_0224FA94 * v4; const UnkStruct_ov9_02252384 * v5; @@ -8061,7 +8061,7 @@ static int ov9_0224FB3C (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, v4 = ov9_0224E37C(param0, sizeof(UnkStruct_ov9_0224FA94)); v1 = &v4->unk_40; v3 = param0->unk_00->playerAvatar; - v2 = Player_LocalMapObject(v3); + v2 = Player_MapObject(v3); sub_02063050(v2, &v0); sub_02062974(v2, 2); @@ -8113,7 +8113,7 @@ static int ov9_0224FB3C (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, static int ov9_0224FC2C (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) { - LocalMapObject * v0 = Player_LocalMapObject(param0->unk_00->playerAvatar); + MapObject * v0 = Player_MapObject(param0->unk_00->playerAvatar); UnkStruct_ov9_0224FA94 * v1 = ov9_0224E39C(param0); UnkStruct_ov9_0224F930 * v2 = &v1->unk_40; @@ -8186,7 +8186,7 @@ static int ov9_0224FD74 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, { int v0; UnkStruct_ov101_021D5D90 * v1 = sub_0205EC04(param0->unk_00->playerAvatar); - LocalMapObject * v2 = Player_LocalMapObject(param0->unk_00->playerAvatar); + MapObject * v2 = Player_MapObject(param0->unk_00->playerAvatar); UnkStruct_ov9_0224FA94 * v3 = ov9_0224E39C(param0); UnkStruct_ov9_0224F930 * v4 = &v3->unk_40; @@ -8262,7 +8262,7 @@ static int ov9_0224FEDC (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, { int v0; UnkStruct_ov101_021D5D90 * v1 = sub_0205EC04(param0->unk_00->playerAvatar); - LocalMapObject * v2 = Player_LocalMapObject(param0->unk_00->playerAvatar); + MapObject * v2 = Player_MapObject(param0->unk_00->playerAvatar); UnkStruct_ov9_0224FA94 * v3 = ov9_0224E39C(param0); UnkStruct_ov9_0224F930 * v4 = &v3->unk_40; @@ -8349,7 +8349,7 @@ static int ov9_022500E0 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, { u32 v0[2] = {0xa, 0x6}; UnkStruct_ov9_0224FA94 * v1 = ov9_0224E39C(param0); - LocalMapObject * v2 = Player_LocalMapObject(param0->unk_00->playerAvatar); + MapObject * v2 = Player_MapObject(param0->unk_00->playerAvatar); if (LocalMapObj_IsAnimationSet(v2) == 0) { return 0; @@ -8383,7 +8383,7 @@ static const UnkStruct_ov9_0224A8A0 Unk_ov9_02251C48 = { static void ov9_02250138 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_02250138 * param1) { - LocalMapObject * v0 = Player_LocalMapObject(param0->unk_00->playerAvatar); + MapObject * v0 = Player_MapObject(param0->unk_00->playerAvatar); int v1 = (((param1->unk_34.unk_10.y) >> 4) / FX32_ONE); if ((param1->unk_04 == 0) && (v1 == 20)) { @@ -8396,7 +8396,7 @@ static int ov9_02250170 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, { VecFx32 v0; UnkStruct_ov9_0224F930 * v1; - LocalMapObject * v2; + MapObject * v2; PlayerAvatar * v3; UnkStruct_ov9_02250138 * v4; const UnkStruct_ov9_022523F0 * v5; @@ -8405,7 +8405,7 @@ static int ov9_02250170 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, v4 = ov9_0224E37C(param0, sizeof(UnkStruct_ov9_02250138)); v1 = &v4->unk_34; v3 = param0->unk_00->playerAvatar; - v2 = Player_LocalMapObject(v3); + v2 = Player_MapObject(v3); sub_02063050(v2, &v0); sub_02062974(v2, 3); @@ -8457,7 +8457,7 @@ static int ov9_02250170 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, static int ov9_02250260 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) { - LocalMapObject * v0 = Player_LocalMapObject(param0->unk_00->playerAvatar); + MapObject * v0 = Player_MapObject(param0->unk_00->playerAvatar); UnkStruct_ov9_02250138 * v1 = ov9_0224E39C(param0); UnkStruct_ov9_0224F930 * v2 = &v1->unk_34; @@ -8527,7 +8527,7 @@ static int ov9_02250388 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, { int v0; UnkStruct_ov101_021D5D90 * v1 = sub_0205EC04(param0->unk_00->playerAvatar); - LocalMapObject * v2 = Player_LocalMapObject(param0->unk_00->playerAvatar); + MapObject * v2 = Player_MapObject(param0->unk_00->playerAvatar); UnkStruct_ov9_02250138 * v3 = ov9_0224E39C(param0); UnkStruct_ov9_0224F930 * v4 = &v3->unk_34; @@ -8580,7 +8580,7 @@ static int ov9_02250468 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, { int v0; UnkStruct_ov101_021D5D90 * v1 = sub_0205EC04(param0->unk_00->playerAvatar); - LocalMapObject * v2 = Player_LocalMapObject(param0->unk_00->playerAvatar); + MapObject * v2 = Player_MapObject(param0->unk_00->playerAvatar); UnkStruct_ov9_02250138 * v3 = ov9_0224E39C(param0); UnkStruct_ov9_0224F930 * v4 = &v3->unk_34; @@ -8662,7 +8662,7 @@ static int ov9_02250650 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, { u32 v0[3] = {0x97, 0x93, 0x73}; UnkStruct_ov9_02250138 * v1 = ov9_0224E39C(param0); - LocalMapObject * v2 = Player_LocalMapObject(param0->unk_00->playerAvatar); + MapObject * v2 = Player_MapObject(param0->unk_00->playerAvatar); if (LocalMapObj_IsAnimationSet(v2) == 0) { return 0; @@ -9282,7 +9282,7 @@ static int ov9_02250C48 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, } v0->unk_10 = sub_02065700(v0->unk_18, v6); - v0->unk_14 = sub_02065700(Player_LocalMapObject(param0->unk_00->playerAvatar), v5); + v0->unk_14 = sub_02065700(Player_MapObject(param0->unk_00->playerAvatar), v5); *param2 = 2; } @@ -9497,7 +9497,7 @@ static void ov9_02250F1C (fx32 * param0, fx32 param1) static void ov9_02250F44 (UnkStruct_ov9_02249B04 * param0, int * param1, int * param2, int * param3) { - LocalMapObject * v0 = Player_LocalMapObject(param0->unk_00->playerAvatar); + MapObject * v0 = Player_MapObject(param0->unk_00->playerAvatar); *param1 = sub_02063020(v0); *param2 = sub_02063030(v0); @@ -9704,7 +9704,7 @@ static void ov9_022511E0 (u16 param0) } } -static void ov9_022511F4 (LocalMapObject * param0, const VecFx32 * param1) +static void ov9_022511F4 (MapObject * param0, const VecFx32 * param1) { UnkStruct_020216E0 * v0; diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c index 28028a819f..c8c3dece8e 100644 --- a/src/overlay023/ov23_02241F74.c +++ b/src/overlay023/ov23_02241F74.c @@ -342,7 +342,7 @@ BOOL ov23_0224240C (int param0, int param1) BOOL ov23_02242458 (void) { VecFx32 v0; - LocalMapObject * v1; + MapObject * v1; int v2, v3; UnkStruct_ov23_0224271C v4; diff --git a/src/overlay023/ov23_0224A1D0.c b/src/overlay023/ov23_0224A1D0.c index 3addeadce8..4b4b116461 100644 --- a/src/overlay023/ov23_0224A1D0.c +++ b/src/overlay023/ov23_0224A1D0.c @@ -840,19 +840,19 @@ void ov23_0224AF7C (int param0) switch (v0->unk_FA[param0]) { case 3: if (v0->unk_28[param0] == NULL) { - v0->unk_28[param0] = ov5_021F5488(Player_LocalMapObject(v0->playerAvatar[param0])); + v0->unk_28[param0] = ov5_021F5488(Player_MapObject(v0->playerAvatar[param0])); } v0->unk_FA[param0] = 0; break; case 2: if (v0->unk_28[param0] == NULL) { - v0->unk_28[param0] = ov5_021F52E4(Player_LocalMapObject(v0->playerAvatar[param0])); + v0->unk_28[param0] = ov5_021F52E4(Player_MapObject(v0->playerAvatar[param0])); } break; case 1: if (v0->unk_28[param0] == NULL) { - v0->unk_28[param0] = ov5_021F511C(Player_LocalMapObject(v0->playerAvatar[param0])); + v0->unk_28[param0] = ov5_021F511C(Player_MapObject(v0->playerAvatar[param0])); } break; case 0: diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c index 3cb831c0e8..a82c47e76f 100644 --- a/src/overlay023/ov23_0224B05C.c +++ b/src/overlay023/ov23_0224B05C.c @@ -1764,7 +1764,7 @@ static void ov23_0224CB1C (SysTask * param0, void * param1) ov23_02254098(ov23_0224219C(), 33); Sound_PlayEffect(1566); - ov5_021F58FC(Player_LocalMapObject(v1->playerAvatar), 0, 0, 0); + ov5_021F58FC(Player_MapObject(v1->playerAvatar), 0, 0, 0); ov23_02253F40(ov23_0224219C(), 33, 0, NULL); v0->unk_0C = 1; diff --git a/src/overlay023/ov23_022521F0.c b/src/overlay023/ov23_022521F0.c index c698442434..72496cef44 100644 --- a/src/overlay023/ov23_022521F0.c +++ b/src/overlay023/ov23_022521F0.c @@ -944,7 +944,7 @@ void ov23_022534A0 (FieldSystem * param0) { int v8, v9; const UnkStruct_020619DC * v10; - LocalMapObject * v11; + MapObject * v11; v8 = sub_0203A4B4(v4->unk_0C); v10 = sub_0203A4BC(v4->unk_0C); diff --git a/src/unk_0203C954.c b/src/unk_0203C954.c index fc30380bbb..b8d6cc64d0 100644 --- a/src/unk_0203C954.c +++ b/src/unk_0203C954.c @@ -43,9 +43,9 @@ static int sub_0203C954 (FieldSystem * param0, int * param1, int * param2) return v0; } -static u8 sub_0203C9B0 (PlayerAvatar * param0, LocalMapObject * param1) +static u8 sub_0203C9B0 (PlayerAvatar * param0, MapObject * param1) { - LocalMapObject * v0 = Player_LocalMapObject(param0); + MapObject * v0 = Player_MapObject(param0); if (sub_020630DC(v0) == sub_020630DC(param1)) { return 1; @@ -54,7 +54,7 @@ static u8 sub_0203C9B0 (PlayerAvatar * param0, LocalMapObject * param1) return 0; } -void sub_0203C9D4 (FieldSystem * param0, LocalMapObject ** param1) +void sub_0203C9D4 (FieldSystem * param0, MapObject ** param1) { int v0, v1; int v2; @@ -83,7 +83,7 @@ void sub_0203C9D4 (FieldSystem * param0, LocalMapObject ** param1) *param1 = sub_0206326C(param0->unk_38, v0, v1, 0); } -u8 sub_0203CA40 (FieldSystem * param0, LocalMapObject ** param1) +u8 sub_0203CA40 (FieldSystem * param0, MapObject ** param1) { sub_0203C9D4(param0, param1); @@ -190,7 +190,7 @@ u16 sub_0203CB80 (FieldSystem * param0, void * param1, int param2) return 0xffff; } -u8 sub_0203CBE0 (FieldSystem * param0, LocalMapObject ** param1) +u8 sub_0203CBE0 (FieldSystem * param0, MapObject ** param1) { if (Player_Dir(param0->playerAvatar) != 0) { return 0; diff --git a/src/unk_0203E880.c b/src/unk_0203E880.c index 904aa83417..ea9686f9ed 100644 --- a/src/unk_0203E880.c +++ b/src/unk_0203E880.c @@ -45,7 +45,7 @@ typedef struct { int unk_08; int unk_0C; int unk_10; - LocalMapObject * unk_14; + MapObject * unk_14; SysTask * unk_18; } UnkStruct_0203E8B0; @@ -63,8 +63,8 @@ struct UnkStruct_0203EF60_t { Window unk_14; UIControlData * unk_24; int unk_28; - LocalMapObject * unk_2C; - LocalMapObject * unk_30; + MapObject * unk_2C; + MapObject * unk_30; u16 * unk_34; ScriptContext * unk_38[2]; StringTemplate * unk_40; @@ -85,12 +85,12 @@ struct UnkStruct_0203EF60_t { #include "data/field/hidden_items.h" -void sub_0203E880(FieldSystem * param0, u16 param1, LocalMapObject * param2); -void sub_0203E8E0(TaskManager * param0, u16 param1, LocalMapObject * param2, void * param3); +void sub_0203E880(FieldSystem * param0, u16 param1, MapObject * param2); +void sub_0203E8E0(TaskManager * param0, u16 param1, MapObject * param2, void * param3); static BOOL sub_0203E950(TaskManager * param0); static UnkStruct_0203EF60 * sub_0203EA28(); static void sub_0203EA50(ScriptContext * param0); -static void sub_0203EA68(FieldSystem * param0, UnkStruct_0203EF60 * param1, u16 param2, LocalMapObject * param3, void * param4); +static void sub_0203EA68(FieldSystem * param0, UnkStruct_0203EF60 * param1, u16 param2, MapObject * param3, void * param4); ScriptContext * sub_0203EAB8(FieldSystem * param0, u16 param1); static void sub_0203EAF4(FieldSystem * param0, ScriptContext * param1, u16 param2, u8 param3); static u16 sub_0203EB20(FieldSystem * param0, ScriptContext * param1, u16 param2); @@ -128,7 +128,7 @@ static u16 sub_0203F610(const u8 * param0, u8 param1); static u16 sub_0203F638(FieldSystem * param0, const u8 * param1, u8 param2); UnkStruct_0203F478 * sub_0203F478(FieldSystem * param0, int param1); -void sub_0203E880 (FieldSystem * param0, u16 param1, LocalMapObject * param2) +void sub_0203E880 (FieldSystem * param0, u16 param1, MapObject * param2) { UnkStruct_0203EF60 * v0 = sub_0203EA28(); @@ -138,7 +138,7 @@ void sub_0203E880 (FieldSystem * param0, u16 param1, LocalMapObject * param2) return; } -void sub_0203E8B0 (FieldSystem * param0, LocalMapObject * param1, int param2, int param3, int param4, int param5, int param6, int param7) +void sub_0203E8B0 (FieldSystem * param0, MapObject * param1, int param2, int param3, int param4, int param5, int param6, int param7) { UnkStruct_0203EF60 * v0 = TaskManager_Environment(param0->unk_10); UnkStruct_0203E8B0 * v1 = &v0->unk_50[param7]; @@ -151,7 +151,7 @@ void sub_0203E8B0 (FieldSystem * param0, LocalMapObject * param1, int param2, in v1->unk_14 = param1; } -void sub_0203E8E0 (TaskManager * param0, u16 param1, LocalMapObject * param2, void * param3) +void sub_0203E8E0 (TaskManager * param0, u16 param1, MapObject * param2, void * param3) { FieldSystem * v0 = TaskManager_FieldSystem(param0); UnkStruct_0203EF60 * v1 = sub_0203EA28(); @@ -162,7 +162,7 @@ void sub_0203E8E0 (TaskManager * param0, u16 param1, LocalMapObject * param2, vo return; } -void sub_0203E918 (TaskManager * param0, u16 param1, LocalMapObject * param2) +void sub_0203E918 (TaskManager * param0, u16 param1, MapObject * param2) { FieldSystem * v0 = TaskManager_FieldSystem(param0); UnkStruct_0203EF60 * v1 = sub_0203EA28(); @@ -254,7 +254,7 @@ static void sub_0203EA50 (ScriptContext * param0) return; } -static void sub_0203EA68 (FieldSystem * param0, UnkStruct_0203EF60 * param1, u16 param2, LocalMapObject * param3, void * param4) +static void sub_0203EA68 (FieldSystem * param0, UnkStruct_0203EF60 * param1, u16 param2, MapObject * param3, void * param4) { u16 * v0 = sub_0203EF60(param1, 54); diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c index c6ed99c7dd..547c4449dd 100644 --- a/src/unk_0203F6C4.c +++ b/src/unk_0203F6C4.c @@ -267,7 +267,7 @@ static BOOL ScrCmd_014(ScriptContext * param0); static BOOL sub_0203F9EC(ScriptContext * param0); static BOOL ScrCmd_015(ScriptContext * param0); static BOOL ScrCmd_GoTo(ScriptContext * ctx); -static LocalMapObject * sub_02040ED4(FieldSystem * param0, int param1); +static MapObject * sub_02040ED4(FieldSystem * param0, int param1); static BOOL ScrCmd_017(ScriptContext * param0); static BOOL ScrCmd_018(ScriptContext * param0); static BOOL ScrCmd_019(ScriptContext * param0); @@ -1901,7 +1901,7 @@ static BOOL ScrCmd_017 (ScriptContext * param0) { u8 v0; s32 v1; - LocalMapObject ** v2; + MapObject ** v2; FieldSystem * v3 = param0->fieldSys; v2 = sub_0203F098(v3, 10); @@ -2282,7 +2282,7 @@ static BOOL ScrCmd_02E (ScriptContext * param0) static BOOL ScrCmd_20C (ScriptContext * param0) { - LocalMapObject ** v0 = sub_0203F098(param0->fieldSys, 10); + MapObject ** v0 = sub_0203F098(param0->fieldSys, 10); u8 v1 = sub_02062950(*v0); ov5_021DD444(param0, param0->loader, (u8)v1, 1, NULL); @@ -2518,7 +2518,7 @@ static BOOL ScrCmd_036 (ScriptContext * param0) v5 = ScriptContext_ReadHalfWord(param0); if (v4 == 0) { - LocalMapObject ** v8 = sub_0203F098(v0, 10); + MapObject ** v8 = sub_0203F098(v0, 10); v4 = sub_020629D8(*v8, 0); } @@ -2989,8 +2989,8 @@ static BOOL ScrCmd_05E (ScriptContext * param0) u8 * v0; SysTask * v1; u8 * v2; - LocalMapObject ** v3; - LocalMapObject * v4; + MapObject ** v3; + MapObject * v4; u16 v5 = ScriptContext_GetVar(param0); u32 v6 = (s32)ScriptContext_ReadWord(param0); @@ -3016,8 +3016,8 @@ static BOOL ScrCmd_2A1 (ScriptContext * param0) u8 * v0; SysTask * v1; u8 * v2; - LocalMapObject ** v3; - LocalMapObject * v4; + MapObject ** v3; + MapObject * v4; u16 v5 = ScriptContext_GetVar(param0); u16 v6 = ScriptContext_GetVar(param0); u16 v7 = ScriptContext_GetVar(param0); @@ -3068,10 +3068,10 @@ static BOOL ScrCmd_2A1 (ScriptContext * param0) return 0; } -static LocalMapObject * sub_02040ED4 (FieldSystem * param0, int param1) +static MapObject * sub_02040ED4 (FieldSystem * param0, int param1) { - LocalMapObject ** v0; - LocalMapObject * v1; + MapObject ** v0; + MapObject * v1; if (param1 == 0xf2) { v1 = sub_02062570(param0->unk_38, 0x30); @@ -3155,14 +3155,14 @@ static BOOL ScrCmd_060 (ScriptContext * param0) { MapObjectManager * v0; FieldSystem * v1 = param0->fieldSys; - LocalMapObject ** v2 = sub_0203F098(v1, 10); + MapObject ** v2 = sub_0203F098(v1, 10); if (*v2 == NULL) { v0 = v1->unk_38; MapObjectMan_PauseAllMovement(v0); { - LocalMapObject * v3 = sub_02062570(v1->unk_38, 0x30); + MapObject * v3 = sub_02062570(v1->unk_38, 0x30); if (v3) { if ((sub_0206A984(SaveData_Events(v1->saveData)) == 1) && (sub_02062D1C(v3) != 0)) { @@ -3204,8 +3204,8 @@ static inline void inline_020410F4_3 (int mask) static BOOL sub_02041004 (ScriptContext * param0) { FieldSystem * v0 = param0->fieldSys; - LocalMapObject ** v1 = sub_0203F098(v0, 10); - LocalMapObject * v2 = Player_LocalMapObject(v0->playerAvatar); + MapObject ** v1 = sub_0203F098(v0, 10); + MapObject * v2 = Player_MapObject(v0->playerAvatar); if (inline_020410F4_1((1 << 0)) && (LocalMapObj_CheckAnimationFinished(v2) == 1)) { sub_02062DD0(v2); @@ -3218,7 +3218,7 @@ static BOOL sub_02041004 (ScriptContext * param0) } if (inline_020410F4_1((1 << 1))) { - LocalMapObject * v3 = sub_02062570(v0->unk_38, 0x30); + MapObject * v3 = sub_02062570(v0->unk_38, 0x30); if (sub_02062D1C(v3) == 0) { sub_02062DD0(v3); @@ -3227,7 +3227,7 @@ static BOOL sub_02041004 (ScriptContext * param0) } if (inline_020410F4_1((1 << 3))) { - LocalMapObject * v4 = sub_02069EB8(*v1); + MapObject * v4 = sub_02069EB8(*v1); if (sub_02062D1C(v4) == 0) { sub_02062DD0(v4); @@ -3245,7 +3245,7 @@ static BOOL sub_02041004 (ScriptContext * param0) static BOOL sub_020410CC (ScriptContext * param0) { FieldSystem * v0 = param0->fieldSys; - LocalMapObject * v1 = sub_02062570(v0->unk_38, 0x30); + MapObject * v1 = sub_02062570(v0->unk_38, 0x30); if (sub_02062D1C(v1) == 0) { sub_02062DD0(v1); @@ -3258,10 +3258,10 @@ static BOOL sub_020410CC (ScriptContext * param0) static BOOL ScrCmd_2B4 (ScriptContext * param0) { FieldSystem * v0 = param0->fieldSys; - LocalMapObject ** v1 = sub_0203F098(v0, 10); - LocalMapObject * v2 = Player_LocalMapObject(v0->playerAvatar); - LocalMapObject * v3 = sub_02062570(v0->unk_38, 0x30); - LocalMapObject * v4 = sub_02069EB8(*v1); + MapObject ** v1 = sub_0203F098(v0, 10); + MapObject * v2 = Player_MapObject(v0->playerAvatar); + MapObject * v3 = sub_02062570(v0->unk_38, 0x30); + MapObject * v4 = sub_02069EB8(*v1); MapObjectManager * v5; v5 = v0->unk_38; @@ -3310,7 +3310,7 @@ static BOOL ScrCmd_061 (ScriptContext * param0) static BOOL ScrCmd_062 (ScriptContext * param0) { - LocalMapObject * v0; + MapObject * v0; FieldSystem * v1 = param0->fieldSys; v0 = MapObjMan_LocalMapObjByIndex(v1->unk_38, ScriptContext_ReadHalfWord(param0)); @@ -3321,7 +3321,7 @@ static BOOL ScrCmd_062 (ScriptContext * param0) static BOOL ScrCmd_063 (ScriptContext * param0) { - LocalMapObject * v0; + MapObject * v0; FieldSystem * v1 = param0->fieldSys; v0 = MapObjMan_LocalMapObjByIndex(v1->unk_38, ScriptContext_ReadHalfWord(param0)); @@ -3332,7 +3332,7 @@ static BOOL ScrCmd_063 (ScriptContext * param0) static BOOL ScrCmd_064 (ScriptContext * param0) { - LocalMapObject * v0; + MapObject * v0; FieldSystem * v1 = param0->fieldSys; u16 v2 = ScriptContext_GetVar(param0); @@ -3347,7 +3347,7 @@ static BOOL ScrCmd_064 (ScriptContext * param0) static BOOL ScrCmd_065 (ScriptContext * param0) { - LocalMapObject * v0; + MapObject * v0; FieldSystem * v1 = param0->fieldSys; v0 = MapObjMan_LocalMapObjByIndex(v1->unk_38, ScriptContext_GetVar(param0)); @@ -3365,7 +3365,7 @@ static BOOL ScrCmd_066 (ScriptContext * param0) { u16 v0 = ScriptContext_GetVar(param0); u16 v1 = ScriptContext_GetVar(param0); - LocalMapObject ** v2 = sub_0203F098(param0->fieldSys, 11); + MapObject ** v2 = sub_0203F098(param0->fieldSys, 11); *v2 = sub_020619DC(param0->fieldSys->unk_38, v0, v1, 0, 0x2000, 0x0, param0->fieldSys->unk_1C->unk_00); @@ -3386,12 +3386,12 @@ static BOOL ScrCmd_066 (ScriptContext * param0) static BOOL ScrCmd_067 (ScriptContext * param0) { - LocalMapObject ** v0 = sub_0203F098(param0->fieldSys, 11); + MapObject ** v0 = sub_0203F098(param0->fieldSys, 11); - LocalMapObj_Delete(*v0); + MapObject_Delete(*v0); { - LocalMapObject * v1; + MapObject * v1; const VecFx32 * v2; v1 = MapObjMan_LocalMapObjByIndex(param0->fieldSys->unk_38, 0xff); @@ -3408,7 +3408,7 @@ static BOOL ScrCmd_308 (ScriptContext * param0) { u16 v0 = ScriptContext_GetVar(param0); u16 v1 = ScriptContext_GetVar(param0); - LocalMapObject ** v2 = sub_0203F098(param0->fieldSys, 11); + MapObject ** v2 = sub_0203F098(param0->fieldSys, 11); *v2 = sub_020619DC(param0->fieldSys->unk_38, v0, v1, 0, 0x2000, 0x0, param0->fieldSys->unk_1C->unk_00); @@ -3421,16 +3421,16 @@ static BOOL ScrCmd_308 (ScriptContext * param0) static BOOL ScrCmd_309 (ScriptContext * param0) { - LocalMapObject ** v0 = sub_0203F098(param0->fieldSys, 11); + MapObject ** v0 = sub_0203F098(param0->fieldSys, 11); - LocalMapObj_Delete(*v0); + MapObject_Delete(*v0); return 0; } static BOOL ScrCmd_068 (ScriptContext * param0) { int v0; - LocalMapObject ** v1; + MapObject ** v1; FieldSystem * v2 = param0->fieldSys; { @@ -3469,7 +3469,7 @@ static BOOL ScrCmd_069 (ScriptContext * param0) static BOOL ScrCmd_06A (ScriptContext * param0) { - LocalMapObject * v0; + MapObject * v0; u16 * v1, * v2; FieldSystem * v3 = param0->fieldSys; @@ -3506,7 +3506,7 @@ static BOOL ScrCmd_06B (ScriptContext * param0) v3.y = FX32_CONST(v1); v3.z = FX32_CONST(v2); - sub_020630AC(Player_LocalMapObject(param0->fieldSys->playerAvatar), &v3); + sub_020630AC(Player_MapObject(param0->fieldSys->playerAvatar), &v3); sub_02020990(&v3, param0->fieldSys->unk_24); return 0; @@ -3514,7 +3514,7 @@ static BOOL ScrCmd_06B (ScriptContext * param0) static BOOL ScrCmd_06C (ScriptContext * param0) { - LocalMapObject * v0; + MapObject * v0; u8 v1; v0 = MapObjMan_LocalMapObjByIndex(param0->fieldSys->unk_38, ScriptContext_GetVar(param0)); @@ -3526,7 +3526,7 @@ static BOOL ScrCmd_06C (ScriptContext * param0) static BOOL ScrCmd_06D (ScriptContext * param0) { - LocalMapObject * v0; + MapObject * v0; u16 v1; v0 = MapObjMan_LocalMapObjByIndex(param0->fieldSys->unk_38, ScriptContext_GetVar(param0)); @@ -3538,7 +3538,7 @@ static BOOL ScrCmd_06D (ScriptContext * param0) static BOOL ScrCmd_2AD (ScriptContext * param0) { - LocalMapObject * v0; + MapObject * v0; u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = 0; @@ -3553,7 +3553,7 @@ static BOOL ScrCmd_2AD (ScriptContext * param0) static BOOL ScrCmd_06E (ScriptContext * param0) { - LocalMapObject * v0; + MapObject * v0; v0 = sub_02062570(param0->fieldSys->unk_38, 0x30); @@ -3890,7 +3890,7 @@ static BOOL ScrCmd_2E8 (ScriptContext * param0) static BOOL ScrCmd_09B (ScriptContext * param0) { u8 v0, v1; - LocalMapObject ** v2 = sub_0203F098(param0->fieldSys, 10); + MapObject ** v2 = sub_0203F098(param0->fieldSys, 10); u16 v3 = ScriptContext_GetVar(param0); u16 * v4 = ScriptContext_GetVarPointer(param0); @@ -4167,7 +4167,7 @@ static BOOL ScrCmd_20A (ScriptContext * param0) static BOOL ScrCmd_20B (ScriptContext * param0) { - LocalMapObject ** v0 = sub_0203F098(param0->fieldSys, 10); + MapObject ** v0 = sub_0203F098(param0->fieldSys, 10); if (*v0 != NULL) { if ((sub_02071CB4(param0->fieldSys, 2) == 0) || (ov8_0224C5DC(param0->fieldSys, *v0) == 0)) { @@ -5370,7 +5370,7 @@ static BOOL ScrCmd_139 (ScriptContext * param0) static BOOL ScrCmd_13C (ScriptContext * param0) { - LocalMapObject ** v0 = sub_0203F098(param0->fieldSys, 10); + MapObject ** v0 = sub_0203F098(param0->fieldSys, 10); StringTemplate ** v1 = sub_0203F098(param0->fieldSys, 15); u16 v2 = ScriptContext_ReadHalfWord(param0); TrainerInfo * v3 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSys)); @@ -5411,7 +5411,7 @@ static BOOL sub_020437E8 (ScriptContext * param0) static BOOL ScrCmd_13F (ScriptContext * param0) { - LocalMapObject ** v0 = sub_0203F098(param0->fieldSys, 10); + MapObject ** v0 = sub_0203F098(param0->fieldSys, 10); u16 v1 = ScriptContext_ReadHalfWord(param0); u16 * v2 = ScriptContext_GetVarPointer(param0); StringTemplate ** v3 = sub_0203F098(param0->fieldSys, 15); @@ -5440,7 +5440,7 @@ static BOOL ScrCmd_2BA (ScriptContext * param0) static BOOL ScrCmd_140 (ScriptContext * param0) { FieldSystem * v0 = param0->fieldSys; - LocalMapObject ** v1 = sub_0203F098(v0, 10); + MapObject ** v1 = sub_0203F098(v0, 10); u16 * v2 = ScriptContext_GetVarPointer(param0); *v2 = sub_0205B780(v0->unk_7C, sub_02062910(*v1)); @@ -5450,7 +5450,7 @@ static BOOL ScrCmd_140 (ScriptContext * param0) static BOOL ScrCmd_146 (ScriptContext * param0) { FieldSystem * v0 = param0->fieldSys; - LocalMapObject ** v1 = sub_0203F098(v0, 10); + MapObject ** v1 = sub_0203F098(v0, 10); u16 v2 = ScriptContext_GetVar(param0); u16 * v3 = ScriptContext_GetVarPointer(param0); @@ -5717,7 +5717,7 @@ static BOOL ScrCmd_186 (ScriptContext * param0) static BOOL ScrCmd_187 (ScriptContext * param0) { - LocalMapObject * v0; + MapObject * v0; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -5772,7 +5772,7 @@ static BOOL ScrCmd_18B (ScriptContext * param0) static BOOL ScrCmd_18C (ScriptContext * param0) { - LocalMapObject * v0; + MapObject * v0; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); @@ -5968,7 +5968,7 @@ static BOOL ScrCmd_317 (ScriptContext * param0) v1 = ScriptContext_GetVarPointer(param0); { - LocalMapObject * v4 = Player_LocalMapObject(v3->playerAvatar); + MapObject * v4 = Player_MapObject(v3->playerAvatar); *v0 = sub_02063020(v4); *v2 = ((sub_02063030(v4) / 2)); @@ -5987,7 +5987,7 @@ static BOOL ScrCmd_1AC (ScriptContext * param0) static BOOL ScrCmd_19E (ScriptContext * param0) { void ** v0 = sub_0203F098(param0->fieldSys, 20); - LocalMapObject ** v1 = sub_0203F098(param0->fieldSys, 10); + MapObject ** v1 = sub_0203F098(param0->fieldSys, 10); u16 v2 = ScriptContext_GetVar(param0); u16 v3 = ScriptContext_ReadHalfWord(param0); @@ -6059,7 +6059,7 @@ static BOOL ScrCmd_03F (ScriptContext * param0) static BOOL ScrCmd_1B1 (ScriptContext * param0) { - LocalMapObject * v0; + MapObject * v0; FieldSystem * v1 = param0->fieldSys; v0 = MapObjMan_LocalMapObjByIndex(v1->unk_38, ScriptContext_GetVar(param0)); @@ -6074,7 +6074,7 @@ static BOOL ScrCmd_1B1 (ScriptContext * param0) static BOOL ScrCmd_1B2 (ScriptContext * param0) { - LocalMapObject * v0; + MapObject * v0; FieldSystem * v1 = param0->fieldSys; v0 = MapObjMan_LocalMapObjByIndex(v1->unk_38, ScriptContext_GetVar(param0)); @@ -7076,7 +7076,7 @@ static BOOL ScrCmd_268 (ScriptContext * param0) static BOOL ScrCmd_269 (ScriptContext * param0) { - LocalMapObject * v0; + MapObject * v0; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -7095,7 +7095,7 @@ static BOOL ScrCmd_269 (ScriptContext * param0) static BOOL ScrCmd_26A (ScriptContext * param0) { - LocalMapObject * v0; + MapObject * v0; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -7808,7 +7808,7 @@ static BOOL ScrCmd_2B5 (ScriptContext * param0) static BOOL ScrCmd_2B6 (ScriptContext * param0) { - LocalMapObject * v0; + MapObject * v0; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_ReadByte(param0); diff --git a/src/unk_02048614.c b/src/unk_02048614.c index 69ff958a19..68ffae337f 100644 --- a/src/unk_02048614.c +++ b/src/unk_02048614.c @@ -53,7 +53,7 @@ BOOL ScrCmd_0B6 (ScriptContext * param0) int * v3; int * v4; SysTask ** v5; - LocalMapObject ** v6; + MapObject ** v6; PlayerAvatar * v7; FieldSystem * v8 = param0->fieldSys; u16 v9 = ScriptContext_GetVar(param0); @@ -312,7 +312,7 @@ BOOL ScrCmd_0EF (ScriptContext * param0) BOOL ScrCmd_0F0 (ScriptContext * param0) { - LocalMapObject ** v0; + MapObject ** v0; FieldSystem * v1 = param0->fieldSys; v0 = sub_0203F098(v1, 10); @@ -325,7 +325,7 @@ BOOL ScrCmd_0F1 (ScriptContext * param0) { int v0; s32 v1; - LocalMapObject ** v2; + MapObject ** v2; FieldSystem * v3 = param0->fieldSys; v2 = sub_0203F098(v3, 10); diff --git a/src/unk_0204B64C.c b/src/unk_0204B64C.c index 30cd088e7a..5c4e5502de 100644 --- a/src/unk_0204B64C.c +++ b/src/unk_0204B64C.c @@ -14,7 +14,7 @@ BOOL ScrCmd_17D (ScriptContext * param0) { - LocalMapObject ** v0; + MapObject ** v0; u16 * v1 = ScriptContext_GetVarPointer(param0); v0 = sub_0203F098(param0->fieldSys, 10); @@ -25,7 +25,7 @@ BOOL ScrCmd_17D (ScriptContext * param0) BOOL ScrCmd_17E (ScriptContext * param0) { - LocalMapObject ** v0 = sub_0203F098(param0->fieldSys, 10); + MapObject ** v0 = sub_0203F098(param0->fieldSys, 10); u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02055F40(param0->fieldSys, *v0); @@ -34,7 +34,7 @@ BOOL ScrCmd_17E (ScriptContext * param0) BOOL ScrCmd_17F (ScriptContext * param0) { - LocalMapObject ** v0 = sub_0203F098(param0->fieldSys, 10); + MapObject ** v0 = sub_0203F098(param0->fieldSys, 10); u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02055F64(param0->fieldSys, *v0); @@ -43,7 +43,7 @@ BOOL ScrCmd_17F (ScriptContext * param0) BOOL ScrCmd_180 (ScriptContext * param0) { - LocalMapObject ** v0 = sub_0203F098(param0->fieldSys, 10); + MapObject ** v0 = sub_0203F098(param0->fieldSys, 10); u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02055F88(param0->fieldSys, *v0); @@ -52,7 +52,7 @@ BOOL ScrCmd_180 (ScriptContext * param0) BOOL ScrCmd_181 (ScriptContext * param0) { - LocalMapObject ** v0 = sub_0203F098(param0->fieldSys, 10); + MapObject ** v0 = sub_0203F098(param0->fieldSys, 10); u16 * v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02055FA8(param0->fieldSys, *v0); @@ -61,7 +61,7 @@ BOOL ScrCmd_181 (ScriptContext * param0) BOOL ScrCmd_182 (ScriptContext * param0) { - LocalMapObject ** v0 = sub_0203F098(param0->fieldSys, 10); + MapObject ** v0 = sub_0203F098(param0->fieldSys, 10); u16 v1 = ScriptContext_GetVar(param0); sub_02055E80(param0->fieldSys, *v0, v1); @@ -70,7 +70,7 @@ BOOL ScrCmd_182 (ScriptContext * param0) BOOL ScrCmd_183 (ScriptContext * param0) { - LocalMapObject ** v0 = sub_0203F098(param0->fieldSys, 10); + MapObject ** v0 = sub_0203F098(param0->fieldSys, 10); UnkStruct_0202CD88 * v1 = sub_0202CD88(param0->fieldSys->saveData); u16 v2 = ScriptContext_GetVar(param0); @@ -100,7 +100,7 @@ BOOL ScrCmd_185 (ScriptContext * param0) { u16 v0; UnkStruct_0202CD88 * v1 = sub_0202CD88(param0->fieldSys->saveData); - LocalMapObject ** v2 = sub_0203F098(param0->fieldSys, 10); + MapObject ** v2 = sub_0203F098(param0->fieldSys, 10); sub_02055E00(param0->fieldSys, *v2); sub_0202CFEC(v1, 0); diff --git a/src/unk_02050568.c b/src/unk_02050568.c index e24605ce57..8d83e6648d 100644 --- a/src/unk_02050568.c +++ b/src/unk_02050568.c @@ -133,7 +133,7 @@ static BOOL sub_020505A0 (TaskManager * param0) static void sub_0205074C (PlayerAvatar * param0, BOOL param1) { - LocalMapObject * v0 = Player_LocalMapObject(param0); + MapObject * v0 = Player_MapObject(param0); sub_02062D64(v0, param1); } diff --git a/src/unk_020530C8.c b/src/unk_020530C8.c index 6f32b69bf3..55056460c9 100644 --- a/src/unk_020530C8.c +++ b/src/unk_020530C8.c @@ -360,7 +360,7 @@ static void sub_02053320 (FieldSystem * param0) static void sub_02053374 (FieldSystem * param0) { - sub_0205E8E0(param0->playerAvatar); + Player_Delete(param0->playerAvatar); sub_02061BBC(param0->unk_38); sub_02061830(param0->unk_38); } diff --git a/src/unk_02055C50.c b/src/unk_02055C50.c index 3c41a64fbb..abfdcfa5c4 100644 --- a/src/unk_02055C50.c +++ b/src/unk_02055C50.c @@ -157,7 +157,7 @@ static BOOL sub_02055D54 (FieldSystem * param0, const VecFx32 * param1) void sub_02055D94 (FieldSystem * param0) { int v0 = 0; - LocalMapObject * v1; + MapObject * v1; UnkStruct_02027854 * v2 = sub_02027854(param0->saveData); while (sub_020625B0(param0->unk_38, &v1, &v0, (1 << 0)) == 1) { @@ -170,7 +170,7 @@ void sub_02055D94 (FieldSystem * param0) } } -BOOL sub_02055E00 (FieldSystem * param0, LocalMapObject * param1) +BOOL sub_02055E00 (FieldSystem * param0, MapObject * param1) { int v0, v1, v2; UnkStruct_02027854 * v3 = sub_02027854(param0->saveData); @@ -186,7 +186,7 @@ BOOL sub_02055E00 (FieldSystem * param0, LocalMapObject * param1) return sub_0207D570(sub_0207D990(param0->saveData), sub_02055C50(v2), v1, 4); } -void sub_02055E80 (FieldSystem * param0, LocalMapObject * param1, u16 param2) +void sub_02055E80 (FieldSystem * param0, MapObject * param1, u16 param2) { int v0; UnkStruct_02027854 * v1 = sub_02027854(param0->saveData); @@ -195,7 +195,7 @@ void sub_02055E80 (FieldSystem * param0, LocalMapObject * param1, u16 param2) sub_02027DA8(v1, v0, sub_02055C80(param2)); } -void sub_02055EAC (FieldSystem * param0, LocalMapObject * param1, u16 param2) +void sub_02055EAC (FieldSystem * param0, MapObject * param1, u16 param2) { int v0; UnkStruct_02027854 * v1 = sub_02027854(param0->saveData); @@ -204,7 +204,7 @@ void sub_02055EAC (FieldSystem * param0, LocalMapObject * param1, u16 param2) sub_02027D40(v1, v0, param0->unk_04->unk_18->unk_04, sub_02055C60(param2)); } -void sub_02055EE0 (FieldSystem * param0, LocalMapObject * param1) +void sub_02055EE0 (FieldSystem * param0, MapObject * param1) { int v0; UnkStruct_02027854 * v1 = sub_02027854(param0->saveData); @@ -213,7 +213,7 @@ void sub_02055EE0 (FieldSystem * param0, LocalMapObject * param1) sub_02027D78(v1, v0); } -int sub_02055F00 (const FieldSystem * param0, const LocalMapObject * param1) +int sub_02055F00 (const FieldSystem * param0, const MapObject * param1) { int v0; UnkStruct_02027854 * v1 = sub_02027854(param0->saveData); @@ -222,7 +222,7 @@ int sub_02055F00 (const FieldSystem * param0, const LocalMapObject * param1) return sub_02027D04(v1, v0); } -int sub_02055F20 (const FieldSystem * param0, const LocalMapObject * param1) +int sub_02055F20 (const FieldSystem * param0, const MapObject * param1) { int v0; UnkStruct_02027854 * v1 = sub_02027854(param0->saveData); @@ -231,7 +231,7 @@ int sub_02055F20 (const FieldSystem * param0, const LocalMapObject * param1) return sub_02027D10(v1, v0); } -u16 sub_02055F40 (const FieldSystem * param0, const LocalMapObject * param1) +u16 sub_02055F40 (const FieldSystem * param0, const MapObject * param1) { int v0; UnkStruct_02027854 * v1 = sub_02027854(param0->saveData); @@ -240,7 +240,7 @@ u16 sub_02055F40 (const FieldSystem * param0, const LocalMapObject * param1) return sub_02055C50(sub_02027D10(v1, v0)); } -u16 sub_02055F64 (const FieldSystem * param0, const LocalMapObject * param1) +u16 sub_02055F64 (const FieldSystem * param0, const MapObject * param1) { int v0; UnkStruct_02027854 * v1 = sub_02027854(param0->saveData); @@ -249,7 +249,7 @@ u16 sub_02055F64 (const FieldSystem * param0, const LocalMapObject * param1) return sub_02055C70(sub_02027D9C(v1, v0)); } -int sub_02055F88 (const FieldSystem * param0, const LocalMapObject * param1) +int sub_02055F88 (const FieldSystem * param0, const MapObject * param1) { int v0; UnkStruct_02027854 * v1 = sub_02027854(param0->saveData); @@ -258,7 +258,7 @@ int sub_02055F88 (const FieldSystem * param0, const LocalMapObject * param1) return sub_02027D18(v1, v0); } -int sub_02055FA8 (const FieldSystem * param0, const LocalMapObject * param1) +int sub_02055FA8 (const FieldSystem * param0, const MapObject * param1) { int v0; UnkStruct_02027854 * v1 = sub_02027854(param0->saveData); @@ -267,7 +267,7 @@ int sub_02055FA8 (const FieldSystem * param0, const LocalMapObject * param1) return sub_02027DB4(v1, v0); } -u32 sub_02055FC8 (const FieldSystem * param0, const LocalMapObject * param1) +u32 sub_02055FC8 (const FieldSystem * param0, const MapObject * param1) { u32 v0 = 0; @@ -327,7 +327,7 @@ static BOOL sub_02056010 (FieldSystem * param0, UnkStruct_020562AC * param1, int return sub_0206326C(param0->unk_38, v0, v1, 0) != NULL; } -static LocalMapObject * sub_02056074 (FieldSystem * param0, int param1) +static MapObject * sub_02056074 (FieldSystem * param0, int param1) { int v0, v1; @@ -344,7 +344,7 @@ static LocalMapObject * sub_02056074 (FieldSystem * param0, int param1) return sub_0206326C(param0->unk_38, v0, v1, 0); } -static LocalMapObject * sub_020560A8 (FieldSystem * param0, UnkStruct_020562AC * param1) +static MapObject * sub_020560A8 (FieldSystem * param0, UnkStruct_020562AC * param1) { int v0, v1; @@ -362,14 +362,14 @@ static LocalMapObject * sub_020560A8 (FieldSystem * param0, UnkStruct_020562AC * return sub_0206326C(param0->unk_38, v0, v1, 0); } -static BOOL sub_020560E4 (LocalMapObject * param0) +static BOOL sub_020560E4 (MapObject * param0) { return sub_02062920(param0) == 0x64; } static void sub_020560F8 (FieldSystem * param0, UnkStruct_020562AC * param1) { - LocalMapObject * v0; + MapObject * v0; v0 = sub_020560A8(param0, param1); @@ -380,7 +380,7 @@ static void sub_020560F8 (FieldSystem * param0, UnkStruct_020562AC * param1) static void sub_0205610C (FieldSystem * param0, UnkStruct_020562AC * param1, const UnkStruct_ov5_021F8E3C * param2) { - LocalMapObject * v0 = Player_LocalMapObject(param0->playerAvatar); + MapObject * v0 = Player_MapObject(param0->playerAvatar); param1->unk_0C = sub_02065700(v0, param2); } @@ -393,7 +393,7 @@ static BOOL sub_02056124 (TaskManager * param0) case 0: ov5_021DFB54(v0->playerAvatar, (1 << 4)); ov5_021DFB5C(v0->playerAvatar); - sub_02062DDC(Player_LocalMapObject(v0->playerAvatar)); + sub_02062DDC(Player_MapObject(v0->playerAvatar)); v1->unk_00 = 1; break; case 1: @@ -402,7 +402,7 @@ static BOOL sub_02056124 (TaskManager * param0) v1->unk_00 = 2; case 2: if (gCoreSys.heldKeys & PAD_KEY_LEFT) { - LocalMapObject * v2 = sub_02056074(v0, 2); + MapObject * v2 = sub_02056074(v0, 2); if ((v2 == NULL) || !sub_020560E4(v2)) { v1->unk_00 = 4; @@ -413,7 +413,7 @@ static BOOL sub_02056124 (TaskManager * param0) break; } } else if (gCoreSys.heldKeys & PAD_KEY_RIGHT) { - LocalMapObject * v2 = sub_02056074(v0, 3); + MapObject * v2 = sub_02056074(v0, 3); if ((v2 == NULL) || !sub_020560E4(v2)) { v1->unk_00 = 4; @@ -441,7 +441,7 @@ static BOOL sub_02056124 (TaskManager * param0) break; case 3: if (sub_0206574C(v1->unk_0C)) { - LocalMapObject * v3; + MapObject * v3; sub_02065758(v1->unk_0C); v3 = sub_020560A8(v0, v1); @@ -456,7 +456,7 @@ static BOOL sub_02056124 (TaskManager * param0) break; case 4: Player_SetDir(v0->playerAvatar, v1->unk_04); - sub_02062DD0(Player_LocalMapObject(v0->playerAvatar)); + sub_02062DD0(Player_MapObject(v0->playerAvatar)); Heap_FreeToHeap(v1); return 1; } diff --git a/src/unk_02056B30.c b/src/unk_02056B30.c index 5e7a7315af..26685ebe45 100644 --- a/src/unk_02056B30.c +++ b/src/unk_02056B30.c @@ -337,14 +337,14 @@ static BOOL sub_02056F1C (TaskManager * param0) { FieldSystem * v0 = TaskManager_FieldSystem(param0); UnkStruct_02056BDC * v1 = TaskManager_Environment(param0); - LocalMapObject * v2; + MapObject * v2; switch (v1->unk_04) { case 0: { int v3 = Player_Dir(v0->playerAvatar); - v2 = Player_LocalMapObject(v0->playerAvatar); + v2 = Player_MapObject(v0->playerAvatar); if (v3 == 2) { LocalMapObj_SetAnimationCode(v2, 0xa); @@ -357,7 +357,7 @@ static BOOL sub_02056F1C (TaskManager * param0) (v1->unk_04)++; break; case 1: - v2 = Player_LocalMapObject(v0->playerAvatar); + v2 = Player_MapObject(v0->playerAvatar); if (LocalMapObj_CheckAnimationFinished(v2) == 1) { sub_020656AC(v2); @@ -383,7 +383,7 @@ static BOOL sub_02056FC0 (TaskManager * param0) { FieldSystem * v0 = TaskManager_FieldSystem(param0); UnkStruct_02056BDC * v1 = TaskManager_Environment(param0); - LocalMapObject * v2 = Player_LocalMapObject(v0->playerAvatar); + MapObject * v2 = Player_MapObject(v0->playerAvatar); switch (v1->unk_04) { case 0: @@ -406,7 +406,7 @@ static BOOL sub_02057008 (TaskManager * param0) { FieldSystem * v0 = TaskManager_FieldSystem(param0); UnkStruct_02056BDC * v1 = TaskManager_Environment(param0); - LocalMapObject * v2 = Player_LocalMapObject(v0->playerAvatar); + MapObject * v2 = Player_MapObject(v0->playerAvatar); switch (v1->unk_04) { case 0: @@ -427,7 +427,7 @@ static BOOL sub_02057008 (TaskManager * param0) static BOOL sub_02057050 (TaskManager * param0) { - LocalMapObject * v0; + MapObject * v0; FieldSystem * v1 = TaskManager_FieldSystem(param0); UnkStruct_02056BDC * v2 = TaskManager_Environment(param0); UnkStruct_ov5_021D432C * v3; @@ -436,7 +436,7 @@ static BOOL sub_02057050 (TaskManager * param0) case 0: { u8 v4; - LocalMapObject * v5 = Player_LocalMapObject(v1->playerAvatar); + MapObject * v5 = Player_MapObject(v1->playerAvatar); v4 = sub_02054F94(v1, Player_XPos(v1->playerAvatar), Player_ZPos(v1->playerAvatar)); @@ -464,7 +464,7 @@ static BOOL sub_02057050 (TaskManager * param0) if (ov5_021D453C(v1, v3)) { ov5_021D432C(v3); { - LocalMapObject * v7 = Player_LocalMapObject(v1->playerAvatar); + MapObject * v7 = Player_MapObject(v1->playerAvatar); sub_02062D64(v7, 0); } @@ -480,7 +480,7 @@ static BOOL sub_02057050 (TaskManager * param0) static BOOL sub_0205711C (TaskManager * param0) { - LocalMapObject * v0; + MapObject * v0; FieldSystem * v1 = TaskManager_FieldSystem(param0); UnkStruct_02056BDC * v2 = TaskManager_Environment(param0); UnkStruct_ov5_021D432C * v3; @@ -489,7 +489,7 @@ static BOOL sub_0205711C (TaskManager * param0) case 0: { u8 v4; - LocalMapObject * v5 = Player_LocalMapObject(v1->playerAvatar); + MapObject * v5 = Player_MapObject(v1->playerAvatar); v4 = sub_02054F94(v1, Player_XPos(v1->playerAvatar), Player_ZPos(v1->playerAvatar)); @@ -545,13 +545,13 @@ static BOOL sub_02057218 (TaskManager * param0) { FieldSystem * v0 = TaskManager_FieldSystem(param0); UnkStruct_02056BDC * v1 = TaskManager_Environment(param0); - LocalMapObject * v2; + MapObject * v2; switch (v1->unk_04) { case 0: ov5_021D1744(1); - v2 = Player_LocalMapObject(v0->playerAvatar); + v2 = Player_MapObject(v0->playerAvatar); if (1) { int v3; @@ -572,7 +572,7 @@ static BOOL sub_02057218 (TaskManager * param0) (v1->unk_04)++; break; case 1: - v2 = Player_LocalMapObject(v0->playerAvatar); + v2 = Player_MapObject(v0->playerAvatar); if (LocalMapObj_CheckAnimationFinished(v2) == 1) { sub_020656AC(v2); @@ -595,7 +595,7 @@ static BOOL sub_020572B8 (TaskManager * param0) { FieldSystem * v0 = TaskManager_FieldSystem(param0); UnkStruct_02056BDC * v1 = TaskManager_Environment(param0); - LocalMapObject * v2 = Player_LocalMapObject(v0->playerAvatar); + MapObject * v2 = Player_MapObject(v0->playerAvatar); switch (v1->unk_04) { case 0: diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c index 1b9f0e6190..9e50a46f1a 100644 --- a/src/unk_0205A0D8.c +++ b/src/unk_0205A0D8.c @@ -332,7 +332,7 @@ static BOOL sub_0205A324 (TaskManager * param0) if (v0->unk_44 != 0) { v0->unk_44--; } else { - if (LocalMapObj_CheckAnimationFinished(Player_LocalMapObject(v1->playerAvatar))) { + if (LocalMapObj_CheckAnimationFinished(Player_MapObject(v1->playerAvatar))) { v0->unk_34 = 11; } } diff --git a/src/unk_0205C22C.c b/src/unk_0205C22C.c index eeb66de362..c7960ae2d0 100644 --- a/src/unk_0205C22C.c +++ b/src/unk_0205C22C.c @@ -43,9 +43,9 @@ static int sub_0205C340(UnkStruct_0205C22C * param0, int param1, WMBssDesc * par static void sub_0205C51C(UnkStruct_0205C22C * param0, MapObjectManager * param1); static void sub_0205C680(UnkStruct_0205C680 * param0, int param1); static void sub_0205C6BC(UnkStruct_0205C680 * param0); -static void sub_0205C6E0(UnkStruct_0205C680 * param0, LocalMapObject * param1, int param2, int param3); -static void sub_0205C788(UnkStruct_0205C680 * param0, LocalMapObject * param1); -static void sub_0205C7BC(UnkStruct_0205C680 * param0, LocalMapObject * param1); +static void sub_0205C6E0(UnkStruct_0205C680 * param0, MapObject * param1, int param2, int param3); +static void sub_0205C788(UnkStruct_0205C680 * param0, MapObject * param1); +static void sub_0205C7BC(UnkStruct_0205C680 * param0, MapObject * param1); static void sub_0205C7E4(MapObjectManager * param0, int param1, int param2); static void sub_0205C444(UnkStruct_0205C680 param0[], int param1, int param2); void sub_0205C970(UnkStruct_0205C95C * param0); @@ -112,7 +112,7 @@ static void sub_0205C304 (SysTask * param0, void * param1) { UnkStruct_0205C22C * v0 = (UnkStruct_0205C22C *)param1; UnkStruct_0205B43C * v1 = v0->unk_00; - LocalMapObject * v2; + MapObject * v2; int v3; if (!sub_020509A4(v0->unk_470)) { @@ -127,7 +127,7 @@ static int sub_0205C340 (UnkStruct_0205C22C * param0, int param1, WMBssDesc * pa int v0, v1, v2 = 0; UnkStruct_0203330C * v3; UnkStruct_0205B4F8 * v4; - LocalMapObject * v5; + MapObject * v5; if (param2 == NULL) { for (v0 = 0; v0 < 4; v0++) { @@ -246,7 +246,7 @@ static void sub_0205C44C (UnkStruct_0205C22C * param0, UnkStruct_0205B43C * para static void sub_0205C51C (UnkStruct_0205C22C * param0, MapObjectManager * param1) { - LocalMapObject * v0; + MapObject * v0; int v1, v2, v3; GF_ASSERT(param0->unk_08 != NULL); @@ -323,7 +323,7 @@ static void sub_0205C51C (UnkStruct_0205C22C * param0, MapObjectManager * param1 } } - sub_0205C7BC(¶m0->unk_0C[50], Player_LocalMapObject(param0->unk_08)); + sub_0205C7BC(¶m0->unk_0C[50], Player_MapObject(param0->unk_08)); sub_0205C6BC(¶m0->unk_0C[50]); } @@ -360,7 +360,7 @@ static void sub_0205C6BC (UnkStruct_0205C680 * param0) } } -static void sub_0205C6E0 (UnkStruct_0205C680 * param0, LocalMapObject * param1, int param2, int param3) +static void sub_0205C6E0 (UnkStruct_0205C680 * param0, MapObject * param1, int param2, int param3) { int v0, v1, v2; @@ -394,7 +394,7 @@ static void sub_0205C6E0 (UnkStruct_0205C680 * param0, LocalMapObject * param1, } } -static void sub_0205C788 (UnkStruct_0205C680 * param0, LocalMapObject * param1) +static void sub_0205C788 (UnkStruct_0205C680 * param0, MapObject * param1) { LocalMapObj_SetAnimationCode(param1, 0x43); sub_02062DB4(param1, 1); @@ -406,7 +406,7 @@ static void sub_0205C788 (UnkStruct_0205C680 * param0, LocalMapObject * param1) param0->unk_01 = 3; } -static void sub_0205C7BC (UnkStruct_0205C680 * param0, LocalMapObject * param1) +static void sub_0205C7BC (UnkStruct_0205C680 * param0, MapObject * param1) { if (param0->unk_03 == 1) { if (param0->unk_04 == 0) { @@ -421,7 +421,7 @@ static void sub_0205C7BC (UnkStruct_0205C680 * param0, LocalMapObject * param1) static void sub_0205C7E4 (MapObjectManager * param0, int param1, int param2) { int v0; - LocalMapObject * v1; + MapObject * v1; for (v0 = param1; v0 < param2; v0++) { v1 = MapObjMan_LocalMapObjByIndex(param0, v0); @@ -438,7 +438,7 @@ static void sub_0205C7E4 (MapObjectManager * param0, int param1, int param2) void sub_0205C820 (MapObjectManager * param0, UnkStruct_0205C22C * param1) { - LocalMapObject * v0; + MapObject * v0; UnkStruct_0205C680 * v1; v0 = MapObjMan_LocalMapObjByIndex(param0, 0); diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c index d6be35670a..2ddce8ac16 100644 --- a/src/unk_0205CA94.c +++ b/src/unk_0205CA94.c @@ -139,7 +139,7 @@ void sub_0205CA94 (SysTask * param0, void * param1) switch (v0->unk_1E4) { case 0: - sub_02062DDC(Player_LocalMapObject(v0->unk_00->playerAvatar)); + sub_02062DDC(Player_MapObject(v0->unk_00->playerAvatar)); sub_0205EB18(v0->unk_00->playerAvatar, 0); v0->unk_1E4++; break; diff --git a/src/unk_0205DFC4.c b/src/unk_0205DFC4.c index 4ecf269338..aa7969cf20 100644 --- a/src/unk_0205DFC4.c +++ b/src/unk_0205DFC4.c @@ -24,7 +24,7 @@ #include "overlay004/ov4_021D0D80.h" typedef struct { - LocalMapObject * unk_00; + MapObject * unk_00; fx32 unk_04; fx32 unk_08; u16 unk_0C; @@ -33,7 +33,7 @@ typedef struct { } UnkStruct_0205E268; typedef struct { - LocalMapObject * unk_00; + MapObject * unk_00; u16 unk_04; u16 unk_06; u8 unk_08; @@ -320,7 +320,7 @@ static BOOL sub_0205E268 (TaskManager * param0) return 0; } -void sub_0205E318 (TaskManager * param0, LocalMapObject * param1, u16 param2, u16 param3, u16 param4, u16 param5) +void sub_0205E318 (TaskManager * param0, MapObject * param1, u16 param2, u16 param3, u16 param4, u16 param5) { FieldSystem * v0 = TaskManager_FieldSystem(param0); UnkStruct_0205E268 * v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0205E268)); @@ -356,7 +356,7 @@ static BOOL sub_0205E3AC (TaskManager * param0) return 0; } -void sub_0205E3F4 (TaskManager * param0, LocalMapObject * param1, u16 param2, u16 param3) +void sub_0205E3F4 (TaskManager * param0, MapObject * param1, u16 param2, u16 param3) { FieldSystem * v0 = TaskManager_FieldSystem(param0); UnkStruct_0205E3AC * v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0205E3AC)); diff --git a/src/unk_0205E7D0.c b/src/unk_0205E7D0.c index 989ec12740..b796067fc7 100644 --- a/src/unk_0205E7D0.c +++ b/src/unk_0205E7D0.c @@ -28,16 +28,16 @@ typedef struct UnkStruct_0205E884_t { int unk_24; int unk_28; int unk_2C; - LocalMapObject * unk_30; + MapObject * mapObject; UnkStruct_ov101_021D5D90 * unk_34; UnkStruct_0205EC34 * unk_38; const UnkStruct_0205EC34 * unk_3C; } PlayerAvatar; -static PlayerAvatar * sub_0205E8FC(void); +static PlayerAvatar * PlayerAvatar_Alloc(void); static void sub_0205E91C(PlayerAvatar * param0, int param1, int param2, UnkStruct_0205EC34 * param3); -static void sub_0205E988(PlayerAvatar * param0, const MapObjectManager * param1, int param2, int param3, int param4, int param5); -static LocalMapObject * sub_0205EA64(const MapObjectManager * param0); +static void PlayerAvatar_AddMapObject(PlayerAvatar * param0, const MapObjectManager * param1, int param2, int param3, int param4, int param5); +static MapObject * sub_0205EA64(const MapObjectManager * param0); static void sub_0205EB9C(PlayerAvatar * param0, u32 param1); static void sub_0205EBA4(PlayerAvatar * param0, u32 param1); static u32 sub_0205EBB0(PlayerAvatar * param0, u32 param1); @@ -45,10 +45,10 @@ static void sub_0205EC08(PlayerAvatar * param0, UnkStruct_0205EC34 * param1); PlayerAvatar * PlayerAvatar_Init (const MapObjectManager * param0, int param1, int param2, int param3, int param4, int param5, int param6, UnkStruct_0205EC34 * param7) { - PlayerAvatar * v0; + PlayerAvatar * playerAvatar; - v0 = sub_0205E8FC(); - sub_0205E91C(v0, param4, param5, param7); + playerAvatar = PlayerAvatar_Alloc(); + sub_0205E91C(playerAvatar, param4, param5, param7); { int v1; @@ -63,102 +63,102 @@ PlayerAvatar * PlayerAvatar_Init (const MapObjectManager * param0, int param1, i } } - sub_0205E988(v0, param0, v1, param3, param1, param2); + PlayerAvatar_AddMapObject(playerAvatar, param0, v1, param3, param1, param2); } - return v0; + return playerAvatar; } PlayerAvatar * sub_0205E820 (const MapObjectManager * param0, UnkStruct_0205EC34 * param1, int param2) { int v0; - PlayerAvatar * v1; - LocalMapObject * v2; + PlayerAvatar * playerAvatar; + MapObject * v2; - v1 = sub_0205E8FC(); + playerAvatar = PlayerAvatar_Alloc(); v0 = sub_0205EC94(param1); - sub_0205E91C(v1, v0, param2, param1); + sub_0205E91C(playerAvatar, v0, param2, param1); v2 = sub_0205EA64(param0); sub_0206291C(v2, sub_0205ED6C(v0, param2)); - sub_020628BC(v2, ((1 << 10) | (1 << 13))); - sub_020628C4(v2, ((1 << 7) | (1 << 8))); + MapObject_SetFlagOn(v2, ((1 << 10) | (1 << 13))); + MapObject_SetFlagOff(v2, ((1 << 7) | (1 << 8))); sub_02062F90(v2, 1); - sub_0205EB38(v1, v2); + PlayerAvatar_SetMapObject(playerAvatar, v2); - return v1; + return playerAvatar; } -void sub_0205E884 (PlayerAvatar * param0, int param1) +void sub_0205E884 (PlayerAvatar * playerAvatar, int groundId) { int v0, v1; - LocalMapObject * v2; + MapObject * v2; const MapObjectManager * v3; - v2 = Player_LocalMapObject(param0); + v2 = Player_MapObject(playerAvatar); GF_ASSERT(v2 != NULL); v3 = sub_02062A40(v2); - ov5_021F6218(param0); + ov5_021F6218(playerAvatar); - if (sub_0205EB74(param0) == 0x2) { - if (param1 != 9) { - int v4 = Player_XPos(param0); - int v5 = Player_ZPos(param0); - int v6 = Player_Dir(param0); + if (sub_0205EB74(playerAvatar) == 0x2) { + if (groundId != 9) { + int v4 = Player_XPos(playerAvatar); + int v5 = Player_ZPos(playerAvatar); + int v6 = Player_Dir(playerAvatar); UnkStruct_ov101_021D5D90 * v7 = ov5_021F261C(v2, v4, v5, v6, 1); - sub_0205EC00(param0, v7); + sub_0205EC00(playerAvatar, v7); } } } -void sub_0205E8E0 (PlayerAvatar * param0) +void Player_Delete (PlayerAvatar * playerAvatar) { - Heap_FreeToHeap(param0); + Heap_FreeToHeap(playerAvatar); } -void Player_Delete (PlayerAvatar * param0) +void Player_DeleteAll (PlayerAvatar * playerAvatar) { - LocalMapObject * v0 = Player_LocalMapObject(param0); + MapObject * mapObject = Player_MapObject(playerAvatar); - LocalMapObj_Delete(v0); - sub_0205E8E0(param0); + MapObject_Delete(mapObject); + Player_Delete(playerAvatar); } -static PlayerAvatar * sub_0205E8FC (void) +static PlayerAvatar * PlayerAvatar_Alloc (void) { - PlayerAvatar * v0; + PlayerAvatar * playerAvatar; - v0 = Heap_AllocFromHeap(11, (sizeof(PlayerAvatar))); - GF_ASSERT(v0 != NULL); - memset(v0, 0, (sizeof(PlayerAvatar))); + playerAvatar = Heap_AllocFromHeap(11, (sizeof(PlayerAvatar))); + GF_ASSERT(playerAvatar != NULL); + memset(playerAvatar, 0, (sizeof(PlayerAvatar))); - return v0; + return playerAvatar; } -static void sub_0205E91C (PlayerAvatar * param0, int param1, int param2, UnkStruct_0205EC34 * param3) +static void sub_0205E91C (PlayerAvatar * playerAvatar, int param1, int param2, UnkStruct_0205EC34 * param3) { - sub_0205EC08(param0, param3); + sub_0205EC08(playerAvatar, param3); - sub_0205EB08(param0, 0); - sub_0205EB10(param0, 0); - sub_0205EB58(param0, param1); - sub_0205EB94(param0, param2); - sub_0205EB8C(param0, 0); - sub_0205EBC0(param0); - sub_0205EBDC(param0, -1); - sub_0205EBE4(param0, -1); - sub_0205EC20(param0, 0xff, 0); + sub_0205EB08(playerAvatar, 0); + sub_0205EB10(playerAvatar, 0); + sub_0205EB58(playerAvatar, param1); + sub_0205EB94(playerAvatar, param2); + sub_0205EB8C(playerAvatar, 0); + sub_0205EBC0(playerAvatar); + sub_0205EBDC(playerAvatar, -1); + sub_0205EBE4(playerAvatar, -1); + sub_0205EC20(playerAvatar, 0xff, 0); - sub_0205EF6C(param0, 1); - sub_0205EFF0(param0, 1); + sub_0205EF6C(playerAvatar, 1); + sub_0205EFF0(playerAvatar, 1); } -static void sub_0205E988 (PlayerAvatar * param0, const MapObjectManager * param1, int param2, int param3, int param4, int param5) +static void PlayerAvatar_AddMapObject (PlayerAvatar * playerAvatar, const MapObjectManager * param1, int param2, int param3, int param4, int param5) { - LocalMapObject * v0; + MapObject * v0; v0 = sub_020619DC(param1, param4, param5, param3, param2, 0x1, 1); GF_ASSERT(v0 != NULL); @@ -172,19 +172,19 @@ static void sub_0205E988 (PlayerAvatar * param0, const MapObjectManager * param1 sub_020629B4(v0, 0, 2); sub_020629FC(v0, -1); sub_02062A04(v0, -1); - sub_020628BC(v0, ((1 << 10) | (1 << 13))); - sub_020628C4(v0, ((1 << 7) | (1 << 8))); + MapObject_SetFlagOn(v0, ((1 << 10) | (1 << 13))); + MapObject_SetFlagOff(v0, ((1 << 7) | (1 << 8))); sub_02062F90(v0, 1); - sub_0205EB38(param0, v0); + PlayerAvatar_SetMapObject(playerAvatar, v0); } -LocalMapObject * sub_0205EA24 (const MapObjectManager * param0) +MapObject * sub_0205EA24 (const MapObjectManager * mapObjMan) { int v0 = 0; - LocalMapObject * v1 = NULL; + MapObject * v1 = NULL; - while (sub_020625B0(param0, &v1, &v0, (1 << 0))) { + while (sub_020625B0(mapObjMan, &v1, &v0, (1 << 0))) { if (sub_02062948(v1) == 0x1) { break; } @@ -193,9 +193,9 @@ LocalMapObject * sub_0205EA24 (const MapObjectManager * param0) return v1; } -static LocalMapObject * sub_0205EA64 (const MapObjectManager * param0) +static MapObject * sub_0205EA64 (const MapObjectManager * mapObjMan) { - LocalMapObject * v0 = sub_0205EA24(param0); + MapObject * v0 = sub_0205EA24(mapObjMan); GF_ASSERT(v0 != NULL); return v0; @@ -203,17 +203,17 @@ static LocalMapObject * sub_0205EA64 (const MapObjectManager * param0) int Player_Dir (PlayerAvatar * const param0) { - return sub_0206298C(Player_LocalMapObject(param0)); + return sub_0206298C(Player_MapObject(param0)); } void Player_SetDir (PlayerAvatar * param0, int param1) { - sub_02062974(Player_LocalMapObject(param0), param1); + sub_02062974(Player_MapObject(param0), param1); } int sub_0205EA94 (PlayerAvatar * const param0) { - return sub_0206299C(Player_LocalMapObject(param0)); + return sub_0206299C(Player_MapObject(param0)); } int sub_0205EAA0 (PlayerAvatar * const param0) @@ -227,27 +227,27 @@ int sub_0205EAA0 (PlayerAvatar * const param0) int Player_XPos (PlayerAvatar * const param0) { - return sub_02063020(Player_LocalMapObject(param0)); + return sub_02063020(Player_MapObject(param0)); } int Player_ZPos (PlayerAvatar * const param0) { - return sub_02063040(Player_LocalMapObject(param0)); + return sub_02063040(Player_MapObject(param0)); } int sub_0205EAD4 (PlayerAvatar * const param0) { - return sub_02063008(Player_LocalMapObject(param0)); + return sub_02063008(Player_MapObject(param0)); } int sub_0205EAE0 (PlayerAvatar * const param0) { - return sub_02063018(Player_LocalMapObject(param0)); + return sub_02063018(Player_MapObject(param0)); } void sub_0205EAEC (PlayerAvatar * const param0, VecFx32 * param1) { - sub_02063050(Player_LocalMapObject(param0), param1); + sub_02063050(Player_MapObject(param0), param1); } const VecFx32 * sub_0205EAFC (PlayerAvatar * const param0) @@ -277,33 +277,33 @@ int Player_MoveState (const PlayerAvatar * param0) void sub_0205EB18 (PlayerAvatar * param0, int param1) { - LocalMapObject * v0; + MapObject * v0; - v0 = Player_LocalMapObject(param0); + v0 = Player_MapObject(param0); if (param1 == 1) { - sub_020628C4(v0, (1 << 9)); + MapObject_SetFlagOff(v0, (1 << 9)); } else { - sub_020628BC(v0, (1 << 9)); + MapObject_SetFlagOn(v0, (1 << 9)); } } -void sub_0205EB38 (PlayerAvatar * param0, LocalMapObject * param1) +void PlayerAvatar_SetMapObject (PlayerAvatar * playerAvatar, MapObject * mapObject) { - param0->unk_30 = param1; + playerAvatar->mapObject = mapObject; } -LocalMapObject * Player_LocalMapObject (PlayerAvatar * param0) +MapObject * Player_MapObject (PlayerAvatar * playerAvatar) { - GF_ASSERT(param0 != NULL); - GF_ASSERT(param0->unk_30 != NULL); + GF_ASSERT(playerAvatar != NULL); + GF_ASSERT(playerAvatar->mapObject != NULL); - return param0->unk_30; + return playerAvatar->mapObject; } -const LocalMapObject * sub_0205EB54 (const PlayerAvatar * param0) +const MapObject * sub_0205EB54 (const PlayerAvatar * param0) { - return param0->unk_30; + return param0->mapObject; } void sub_0205EB58 (PlayerAvatar * param0, int param1) @@ -538,9 +538,9 @@ void sub_0205ECA8 (PlayerAvatar * param0, u32 param1) void sub_0205ECB8 (PlayerAvatar * param0, const VecFx32 * param1, int param2) { - LocalMapObject * v0; + MapObject * v0; - v0 = Player_LocalMapObject(param0); + v0 = Player_MapObject(param0); sub_020632D4(v0, param1, param2); sub_0205EB08(param0, 0); @@ -549,9 +549,9 @@ void sub_0205ECB8 (PlayerAvatar * param0, const VecFx32 * param1, int param2) void sub_0205ECE0 (PlayerAvatar * param0, int param1, int param2, int param3) { - LocalMapObject * v0; + MapObject * v0; - v0 = Player_LocalMapObject(param0); + v0 = Player_MapObject(param0); LocalMapObj_SetPosDir(v0, param1, 0, param2, param3); sub_0205EB08(param0, 0); @@ -561,7 +561,7 @@ void sub_0205ECE0 (PlayerAvatar * param0, int param1, int param2, int param3) void sub_0205ED0C (PlayerAvatar * param0, fx32 param1) { VecFx32 v0; - LocalMapObject * v1 = Player_LocalMapObject(param0); + MapObject * v1 = Player_MapObject(param0); sub_02063050(v1, &v0); v0.y = param1; @@ -570,7 +570,7 @@ void sub_0205ED0C (PlayerAvatar * param0, fx32 param1) void sub_0205ED2C (PlayerAvatar * param0, int param1) { - LocalMapObject * v0 = Player_LocalMapObject(param0); + MapObject * v0 = Player_MapObject(param0); if (param1 == 1) { sub_02062E28(v0, 0); @@ -581,7 +581,7 @@ void sub_0205ED2C (PlayerAvatar * param0, int param1) void sub_0205ED48 (PlayerAvatar * param0, int param1) { - LocalMapObject * v0 = Player_LocalMapObject(param0); + MapObject * v0 = Player_MapObject(param0); if (param1 == 1) { sub_02062E28(v0, 0); diff --git a/src/unk_0205F180.c b/src/unk_0205F180.c index d301943bc4..73933dd5d8 100644 --- a/src/unk_0205F180.c +++ b/src/unk_0205F180.c @@ -51,60 +51,60 @@ static int sub_0205FAB0(PlayerAvatar * param0, int param1); static int sub_0205FB10(PlayerAvatar * param0, int param1); static void sub_0205FB40(PlayerAvatar * param0, int param1); static void inline_0205F180(PlayerAvatar * param0, const UnkStruct_ov5_021E8F60 * param1, int param2, u16 param3, u16 param4); -static void inline_0205F180_sub(PlayerAvatar * param0, LocalMapObject * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5); +static void inline_0205F180_sub(PlayerAvatar * param0, MapObject * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5); static int sub_0205FC48(PlayerAvatar * param0, int param1); static int sub_0205FC64(int param0); -static int sub_0205FC88(LocalMapObject * param0, u8 param1, int param2); -static int sub_0205FCBC(LocalMapObject * param0, u8 param1, int param2); +static int sub_0205FC88(MapObject * param0, u8 param1, int param2); +static int sub_0205FCBC(MapObject * param0, u8 param1, int param2); static int sub_0205FCC0(PlayerAvatar * param0, int param1); -static void sub_0205FD20(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4); -static void sub_0205FD40(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4); -static void sub_0205FDC8(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4); -static void sub_0205FECC(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4); -static void sub_020600CC(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4); -static void sub_02060150(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4); -static void sub_020601D4(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4); -static void sub_02060258(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4); -static void sub_020602DC(PlayerAvatar * param0, LocalMapObject * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5); +static void sub_0205FD20(PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4); +static void sub_0205FD40(PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4); +static void sub_0205FDC8(PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4); +static void sub_0205FECC(PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4); +static void sub_020600CC(PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4); +static void sub_02060150(PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4); +static void sub_020601D4(PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4); +static void sub_02060258(PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4); +static void sub_020602DC(PlayerAvatar * param0, MapObject * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5); static void sub_02060324(PlayerAvatar * param0, u16 param1); int sub_02060390(PlayerAvatar * param0, int param1); static int sub_020603BC(PlayerAvatar * param0); static int sub_020603EC(PlayerAvatar * param0); -static void sub_02060420(PlayerAvatar * param0, LocalMapObject * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5); +static void sub_02060420(PlayerAvatar * param0, MapObject * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5); static int sub_02060494(PlayerAvatar * param0, int param1); static int sub_020604B0(int param0); static int sub_020604E4(PlayerAvatar * param0, int param1); -static void sub_02060548(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4); -static void sub_02060570(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4); -static void sub_02060688(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4); -static void sub_020606C8(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4); -static void sub_0206078C(PlayerAvatar * param0, LocalMapObject * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5); +static void sub_02060548(PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4); +static void sub_02060570(PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4); +static void sub_02060688(PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4); +static void sub_020606C8(PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4); +static void sub_0206078C(PlayerAvatar * param0, MapObject * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5); static int sub_02060800(PlayerAvatar * param0, int param1); static int sub_0206081C(int param0); static int sub_02060850(PlayerAvatar * param0, int param1); -static void sub_020608BC(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4); -static void sub_020608E4(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4); -static void sub_02060A60(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4); -static void sub_02060AA0(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4); -static u32 sub_02060C24(PlayerAvatar * param0, LocalMapObject * param1, int param2); -static int sub_02060CE4(PlayerAvatar * param0, LocalMapObject * param1, int param2); -static int sub_02060D98(PlayerAvatar * param0, LocalMapObject * param1, int param2); -static int sub_02060E40(PlayerAvatar * param0, LocalMapObject * param1, int param2); -static int sub_02060EE4(PlayerAvatar * param0, LocalMapObject * param1, int param2); -static int sub_02060F4C(PlayerAvatar * param0, LocalMapObject * param1, int param2); -static int sub_02060FA8(PlayerAvatar * param0, LocalMapObject * param1, int param2); -static int sub_02061058(PlayerAvatar * param0, LocalMapObject * param1, int param2); -static int sub_02061180(PlayerAvatar * param0, LocalMapObject * param1, int param2); -static int sub_02061100(PlayerAvatar * param0, LocalMapObject * param1, int param2); -static int sub_02061248(PlayerAvatar * param0, LocalMapObject * param1, int param2); +static void sub_020608BC(PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4); +static void sub_020608E4(PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4); +static void sub_02060A60(PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4); +static void sub_02060AA0(PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4); +static u32 sub_02060C24(PlayerAvatar * param0, MapObject * param1, int param2); +static int sub_02060CE4(PlayerAvatar * param0, MapObject * param1, int param2); +static int sub_02060D98(PlayerAvatar * param0, MapObject * param1, int param2); +static int sub_02060E40(PlayerAvatar * param0, MapObject * param1, int param2); +static int sub_02060EE4(PlayerAvatar * param0, MapObject * param1, int param2); +static int sub_02060F4C(PlayerAvatar * param0, MapObject * param1, int param2); +static int sub_02060FA8(PlayerAvatar * param0, MapObject * param1, int param2); +static int sub_02061058(PlayerAvatar * param0, MapObject * param1, int param2); +static int sub_02061180(PlayerAvatar * param0, MapObject * param1, int param2); +static int sub_02061100(PlayerAvatar * param0, MapObject * param1, int param2); +static int sub_02061248(PlayerAvatar * param0, MapObject * param1, int param2); static int sub_02061310(u16 param0); static int sub_0206132C(u16 param0); static int sub_02061348(PlayerAvatar * param0, u16 param1, u16 param2); static int sub_020613D8(int param0); static void sub_020615C8(PlayerAvatar * param0); -static int sub_020615E0(PlayerAvatar * param0, LocalMapObject * param1, int param2); +static int sub_020615E0(PlayerAvatar * param0, MapObject * param1, int param2); static int sub_02061630(PlayerAvatar * param0, u32 param1, int param2); -static void sub_02060B64(PlayerAvatar * param0, LocalMapObject * param1, u32 param2, int param3); +static void sub_02060B64(PlayerAvatar * param0, MapObject * param1, u32 param2, int param3); static const UnkStruct_020EDB04 Unk_020EDB04[4] = { {0x0, 0x0, -1}, @@ -181,9 +181,9 @@ int sub_0205F224 (PlayerAvatar * param0, int param1) static int sub_0205F22C (PlayerAvatar * param0, int param1) { int v0; - LocalMapObject * v1; + MapObject * v1; - v1 = Player_LocalMapObject(param0); + v1 = Player_MapObject(param0); if (LocalMapObj_IsAnimationSet(v1) == 1) { return 1; @@ -253,7 +253,7 @@ static void sub_0205F378 (PlayerAvatar * param0) if (sub_0205F008(param0) == 1) { sub_0205EFF0(param0, 0); - sub_02062EE0(Player_LocalMapObject(param0), 0); + sub_02062EE0(Player_MapObject(param0), 0); } } } @@ -261,7 +261,7 @@ static void sub_0205F378 (PlayerAvatar * param0) static void sub_0205F3B8 (PlayerAvatar * param0) { if (sub_0205EB0C(param0) == 1) { - LocalMapObject * v0 = Player_LocalMapObject(param0); + MapObject * v0 = Player_MapObject(param0); u8 v1, v2 = sub_02062BE8(v0); { @@ -310,11 +310,11 @@ static void sub_0205F3B8 (PlayerAvatar * param0) void sub_0205F490 (PlayerAvatar * param0) { int v0, v1, v2; - const LocalMapObject * v3; + const MapObject * v3; v0 = sub_0205EB0C(param0); v1 = Player_MoveState(param0); - v3 = Player_LocalMapObject(param0); + v3 = Player_MapObject(param0); sub_0205EB10(param0, 0); @@ -394,7 +394,7 @@ void sub_0205F56C (PlayerAvatar * param0) int sub_0205F588 (PlayerAvatar * param0) { int v0, v1, v2; - const LocalMapObject * v3; + const MapObject * v3; v0 = sub_0205EB0C(param0); v1 = Player_MoveState(param0); @@ -412,7 +412,7 @@ int sub_0205F588 (PlayerAvatar * param0) return 1; } - v3 = Player_LocalMapObject(param0); + v3 = Player_MapObject(param0); if (LocalMapObj_IsAnimationSet(v3) == 1) { return 1; @@ -430,12 +430,12 @@ int sub_0205F588 (PlayerAvatar * param0) void sub_0205F5E4 (PlayerAvatar * param0, int param1) { - LocalMapObject * v0; + MapObject * v0; sub_0205EB08(param0, 0); sub_0205EB10(param0, 0); - v0 = Player_LocalMapObject(param0); + v0 = Player_MapObject(param0); sub_02062974(v0, param1); sub_02062A0C(v0, 0x0); @@ -455,7 +455,7 @@ static int sub_0205F62C (PlayerAvatar * param0, int param1) static u32 sub_0205F644 (PlayerAvatar * param0, int param1) { int v0 = 0; - u32 v1 = sub_02062BE8(Player_LocalMapObject(param0)); + u32 v1 = sub_02062BE8(Player_MapObject(param0)); if (sub_02061630(param0, v1, param1) == 1) { return 5; @@ -501,7 +501,7 @@ static int sub_0205F6C4 (PlayerAvatar * param0, int param1) static int sub_0205F6D0 (PlayerAvatar * param0, int param1) { - LocalMapObject * v0 = Player_LocalMapObject(param0); + MapObject * v0 = Player_MapObject(param0); int v1 = sub_0206299C(v0); int v2 = sub_0205FAB0(param0, v1); u32 v3 = sub_02060B7C(param0, v0, v1); @@ -524,7 +524,7 @@ static int sub_0205F6D0 (PlayerAvatar * param0, int param1) return 0; } - sub_020628BC(v0, (1 << 7) | (1 << 8)); + MapObject_SetFlagOn(v0, (1 << 7) | (1 << 8)); sub_02060B64(param0, v0, sub_02065838(v1, 0x8), 3); sub_0205EF6C(param0, 1); sub_0205EF40(param0, 1); @@ -544,13 +544,13 @@ static int sub_0205F6D0 (PlayerAvatar * param0, int param1) return 0; } - sub_020628BC(v0, (1 << 7) | (1 << 8)); + MapObject_SetFlagOn(v0, (1 << 7) | (1 << 8)); sub_02060B64(param0, v0, sub_02065838(v1, 0x8), 3); sub_0205EF6C(param0, 1); sub_0205EF40(param0, 1); sub_0205EBEC(param0, -1, -1); } else { - sub_020628BC(v0, (1 << 7) | (1 << 8)); + MapObject_SetFlagOn(v0, (1 << 7) | (1 << 8)); sub_0205FB40(param0, v1); } @@ -561,7 +561,7 @@ static int sub_0205F6D0 (PlayerAvatar * param0, int param1) static int sub_0205F808 (PlayerAvatar * param0, int param1) { u32 v0; - LocalMapObject * v1 = Player_LocalMapObject(param0); + MapObject * v1 = Player_MapObject(param0); int v2 = sub_0206299C(v1); Sound_PlayEffect(1620); @@ -582,7 +582,7 @@ static int sub_0205F808 (PlayerAvatar * param0, int param1) return 0; } - sub_020628BC(v1, (1 << 7) | (1 << 8)); + MapObject_SetFlagOn(v1, (1 << 7) | (1 << 8)); sub_02060B64(param0, v1, sub_02065838(v2, 0x8), 3); sub_0205EBC0(param0); sub_0205EF40(param0, 1); @@ -602,7 +602,7 @@ static int sub_0205F808 (PlayerAvatar * param0, int param1) sub_0205EBEC(param0, -1, -1); return 1; } else { - sub_020628BC(v1, (1 << 7) | (1 << 8)); + MapObject_SetFlagOn(v1, (1 << 7) | (1 << 8)); sub_02060B64(param0, v1, sub_02065838(v2, 0x8), 3); sub_0205EF40(param0, 1); sub_0205EB08(param0, 1); @@ -617,7 +617,7 @@ static int sub_0205F808 (PlayerAvatar * param0, int param1) static int sub_0205F95C (PlayerAvatar * param0, int param1) { - LocalMapObject * v0 = Player_LocalMapObject(param0); + MapObject * v0 = Player_MapObject(param0); int v1 = sub_0206299C(v0); if (sub_0205EC88(param0) == 1) { @@ -635,7 +635,7 @@ static int sub_0205F95C (PlayerAvatar * param0, int param1) static int sub_0205F9AC (PlayerAvatar * param0, int param1) { - LocalMapObject * v0 = Player_LocalMapObject(param0); + MapObject * v0 = Player_MapObject(param0); int v1 = sub_0206299C(v0); if (sub_0205EC88(param0) == 1) { @@ -654,7 +654,7 @@ static int sub_0205F9AC (PlayerAvatar * param0, int param1) static int sub_0205F9FC (PlayerAvatar * param0, int param1) { int v0 = 1; - LocalMapObject * v1 = Player_LocalMapObject(param0); + MapObject * v1 = Player_MapObject(param0); u32 v2 = sub_02060B7C(param0, v1, v0); if (v2 == 0) { @@ -685,9 +685,9 @@ static int(*const Unk_020EDAEC[6])(PlayerAvatar *, int) = { static void sub_0205FA6C (PlayerAvatar * param0) { if (sub_0205EF58(param0) == 1) { - LocalMapObject * v0 = Player_LocalMapObject(param0); + MapObject * v0 = Player_MapObject(param0); - sub_020628C4(v0, (1 << 7) | (1 << 8)); + MapObject_SetFlagOff(v0, (1 << 7) | (1 << 8)); if (sub_0205F08C(param0) == 0) { sub_0205EBC0(param0); @@ -703,7 +703,7 @@ static int sub_0205FAB0 (PlayerAvatar * param0, int param1) { int v0; VecFx32 v1, v2; - LocalMapObject * v3 = Player_LocalMapObject(param0); + MapObject * v3 = Player_MapObject(param0); FieldSystem * v4 = sub_02062C00(v3); sub_02063050(v3, &v1); @@ -747,7 +747,7 @@ static int sub_0205FB10 (PlayerAvatar * param0, int param1) static void sub_0205FB40 (PlayerAvatar * param0, int param1) { - LocalMapObject * v0 = Player_LocalMapObject(param0); + MapObject * v0 = Player_MapObject(param0); int v1 = 0x10; int v2 = sub_0205EBB8(param0); int v3 = 5; @@ -774,7 +774,7 @@ static void sub_0205FB40 (PlayerAvatar * param0, int param1) static void inline_0205F180 (PlayerAvatar * param0, const UnkStruct_ov5_021E8F60 * param1, int param2, u16 param3, u16 param4) { int v0 = sub_0205EB74(param0); - LocalMapObject * v1 = Player_LocalMapObject(param0); + MapObject * v1 = Player_MapObject(param0); switch (v0) { case 0x0: @@ -790,7 +790,7 @@ static void inline_0205F180 (PlayerAvatar * param0, const UnkStruct_ov5_021E8F60 } } -static void inline_0205F180_sub (PlayerAvatar * param0, LocalMapObject * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5) +static void inline_0205F180_sub (PlayerAvatar * param0, MapObject * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5) { int v0; @@ -833,7 +833,7 @@ static int sub_0205FC64 (int param0) return 0; } -static int sub_0205FC88 (LocalMapObject * param0, u8 param1, int param2) +static int sub_0205FC88 (MapObject * param0, u8 param1, int param2) { if (sub_0205DD5C(param1) == 1) { return 0x4; @@ -850,7 +850,7 @@ static int sub_0205FC88 (LocalMapObject * param0, u8 param1, int param2) return param2; } -static int sub_0205FCBC (LocalMapObject * param0, u8 param1, int param2) +static int sub_0205FCBC (MapObject * param0, u8 param1, int param2) { return param2; } @@ -883,7 +883,7 @@ static int sub_0205FCC0 (PlayerAvatar * param0, int param1) return 1; } -static void sub_0205FD20 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4) +static void sub_0205FD20 (PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4) { int v0; @@ -891,7 +891,7 @@ static void sub_0205FD20 (PlayerAvatar * param0, LocalMapObject * param1, int pa sub_02060B64(param0, param1, v0, 1); } -static void sub_0205FD40 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4) +static void sub_0205FD40 (PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4) { int v0 = sub_0205F108(param0); @@ -913,7 +913,7 @@ static void sub_0205FD40 (PlayerAvatar * param0, LocalMapObject * param1, int pa } } -static void sub_0205FDC8 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4) +static void sub_0205FDC8 (PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4) { u32 v0; int v1; @@ -981,7 +981,7 @@ static void sub_0205FDC8 (PlayerAvatar * param0, LocalMapObject * param1, int pa sub_02060B64(param0, param1, v1, v2); } -static void sub_0205FECC (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4) +static void sub_0205FECC (PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4) { u32 v0; int v1; @@ -1050,7 +1050,7 @@ static void sub_0205FECC (PlayerAvatar * param0, LocalMapObject * param1, int pa sub_02060B64(param0, param1, v1, v2); } -static void sub_0206000C (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4, const int * param5, const int * param6, const int * param7, const int * param8, const int * param9) +static void sub_0206000C (PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4, const int * param5, const int * param6, const int * param7, const int * param8, const int * param9) { u32 v0; int v1; @@ -1097,7 +1097,7 @@ static void sub_0206000C (PlayerAvatar * param0, LocalMapObject * param1, int pa sub_02060B64(param0, param1, v1, v2); } -static void sub_020600CC (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4) +static void sub_020600CC (PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4) { int v0[4] = {0x69, 0x6a, 0x6b, 0x6c}; int v1[4] = {0x79, 0x7a, 0x7b, 0x7c}; @@ -1108,7 +1108,7 @@ static void sub_020600CC (PlayerAvatar * param0, LocalMapObject * param1, int pa sub_0206000C(param0, param1, param2, param3, param4, v0, v1, v2, v3, v4); } -static void sub_02060150 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4) +static void sub_02060150 (PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4) { int v0[4] = {0x6d, 0x6e, 0x6f, 0x70}; int v1[4] = {0x7d, 0x7e, 0x7f, 0x80}; @@ -1119,7 +1119,7 @@ static void sub_02060150 (PlayerAvatar * param0, LocalMapObject * param1, int pa sub_0206000C(param0, param1, param2, param3, param4, v0, v1, v2, v3, v4); } -static void sub_020601D4 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4) +static void sub_020601D4 (PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4) { int v0[4] = {0x71, 0x72, 0x73, 0x74}; int v1[4] = {0x81, 0x82, 0x83, 0x84}; @@ -1130,7 +1130,7 @@ static void sub_020601D4 (PlayerAvatar * param0, LocalMapObject * param1, int pa sub_0206000C(param0, param1, param2, param3, param4, v0, v1, v2, v3, v4); } -static void sub_02060258 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4) +static void sub_02060258 (PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4) { int v0, v1; int v2; @@ -1165,7 +1165,7 @@ static void sub_02060258 (PlayerAvatar * param0, LocalMapObject * param1, int pa sub_02062994(param1, param2); } -static void sub_020602DC (PlayerAvatar * param0, LocalMapObject * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5) +static void sub_020602DC (PlayerAvatar * param0, MapObject * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5) { int v0; @@ -1183,7 +1183,7 @@ static void sub_02060324 (PlayerAvatar * param0, u16 param1) } if ((param1 & PAD_BUTTON_B)) { - u32 v0 = sub_02062BE8(Player_LocalMapObject(param0)); + u32 v0 = sub_02062BE8(Player_MapObject(param0)); if (sub_0205DD90(v0) || sub_0205DD9C(v0)) { return; @@ -1269,7 +1269,7 @@ static int sub_020603EC (PlayerAvatar * param0) return v0; } -static void sub_02060420 (PlayerAvatar * param0, LocalMapObject * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5) +static void sub_02060420 (PlayerAvatar * param0, MapObject * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5) { int v0 = sub_02060494(param0, param3); @@ -1341,7 +1341,7 @@ static int sub_020604E4 (PlayerAvatar * param0, int param1) return 1; } -static void sub_02060548 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4) +static void sub_02060548 (PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4) { int v0; @@ -1351,7 +1351,7 @@ static void sub_02060548 (PlayerAvatar * param0, LocalMapObject * param1, int pa sub_0205EBC0(param0); } -static void sub_02060570 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4) +static void sub_02060570 (PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4) { u32 v0; int v1; @@ -1413,7 +1413,7 @@ static void sub_02060570 (PlayerAvatar * param0, LocalMapObject * param1, int pa sub_02060B64(param0, param1, v1, v2); } -static void sub_02060688 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4) +static void sub_02060688 (PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4) { sub_0205EBC0(param0); @@ -1428,7 +1428,7 @@ static void sub_02060688 (PlayerAvatar * param0, LocalMapObject * param1, int pa } } -static void sub_020606C8 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4) +static void sub_020606C8 (PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4) { u32 v0; int v1; @@ -1470,7 +1470,7 @@ static void sub_020606C8 (PlayerAvatar * param0, LocalMapObject * param1, int pa sub_02060B64(param0, param1, v2, v1); } -static void sub_0206078C (PlayerAvatar * param0, LocalMapObject * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5) +static void sub_0206078C (PlayerAvatar * param0, MapObject * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5) { int v0 = sub_02060800(param0, param3); @@ -1548,7 +1548,7 @@ static int sub_02060850 (PlayerAvatar * param0, int param1) return 1; } -static void sub_020608BC (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4) +static void sub_020608BC (PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4) { int v0; @@ -1558,7 +1558,7 @@ static void sub_020608BC (PlayerAvatar * param0, LocalMapObject * param1, int pa sub_0205EBC0(param0); } -static void sub_020608E4 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4) +static void sub_020608E4 (PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4) { u32 v0; int v1; @@ -1632,7 +1632,7 @@ static void sub_020608E4 (PlayerAvatar * param0, LocalMapObject * param1, int pa sub_02060B64(param0, param1, v1, v2); } -static void sub_02060A60 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4) +static void sub_02060A60 (PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4) { sub_0205EBC0(param0); @@ -1647,7 +1647,7 @@ static void sub_02060A60 (PlayerAvatar * param0, LocalMapObject * param1, int pa } } -static void sub_02060AA0 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4) +static void sub_02060AA0 (PlayerAvatar * param0, MapObject * param1, int param2, u16 param3, u16 param4) { u32 v0; int v1; @@ -1689,13 +1689,13 @@ static void sub_02060AA0 (PlayerAvatar * param0, LocalMapObject * param1, int pa sub_02060B64(param0, param1, v2, v1); } -static void sub_02060B64 (PlayerAvatar * param0, LocalMapObject * param1, u32 param2, int param3) +static void sub_02060B64 (PlayerAvatar * param0, MapObject * param1, u32 param2, int param3) { sub_0205EC20(param0, param2, param3); LocalMapObj_SetAnimationCode(param1, param2); } -u32 sub_02060B7C (PlayerAvatar * param0, LocalMapObject * param1, int param2) +u32 sub_02060B7C (PlayerAvatar * param0, MapObject * param1, int param2) { u32 v0, v1; @@ -1741,7 +1741,7 @@ u32 sub_02060B7C (PlayerAvatar * param0, LocalMapObject * param1, int param2) return v0; } -static u32 sub_02060C24 (PlayerAvatar * param0, LocalMapObject * param1, int param2) +static u32 sub_02060C24 (PlayerAvatar * param0, MapObject * param1, int param2) { VecFx32 v0; u32 v1, v2; @@ -1781,7 +1781,7 @@ static u32 sub_02060C24 (PlayerAvatar * param0, LocalMapObject * param1, int par return v1; } -static int sub_02060CE4 (PlayerAvatar * param0, LocalMapObject * param1, int param2) +static int sub_02060CE4 (PlayerAvatar * param0, MapObject * param1, int param2) { if (param2 != -1) { FieldSystem * v0 = sub_02062C00(param1); @@ -1823,7 +1823,7 @@ static int sub_02060CE4 (PlayerAvatar * param0, LocalMapObject * param1, int par return 0; } -static int sub_02060D98 (PlayerAvatar * param0, LocalMapObject * param1, int param2) +static int sub_02060D98 (PlayerAvatar * param0, MapObject * param1, int param2) { BOOL v0 = 0; @@ -1860,7 +1860,7 @@ static int sub_02060D98 (PlayerAvatar * param0, LocalMapObject * param1, int par return v0; } -static int sub_02060E40 (PlayerAvatar * param0, LocalMapObject * param1, int param2) +static int sub_02060E40 (PlayerAvatar * param0, MapObject * param1, int param2) { if (param2 != -1) { FieldSystem * v0 = sub_02062C00(param1); @@ -1903,7 +1903,7 @@ static int sub_02060E40 (PlayerAvatar * param0, LocalMapObject * param1, int par return 0; } -static int sub_02060EE4 (PlayerAvatar * param0, LocalMapObject * param1, int param2) +static int sub_02060EE4 (PlayerAvatar * param0, MapObject * param1, int param2) { if (param2 != -1) { FieldSystem * v0 = sub_02062C00(param1); @@ -1923,7 +1923,7 @@ static int sub_02060EE4 (PlayerAvatar * param0, LocalMapObject * param1, int par return 0; } -static int sub_02060F4C (PlayerAvatar * param0, LocalMapObject * param1, int param2) +static int sub_02060F4C (PlayerAvatar * param0, MapObject * param1, int param2) { if (param2 != -1) { FieldSystem * v0 = sub_02062C00(param1); @@ -1939,7 +1939,7 @@ static int sub_02060F4C (PlayerAvatar * param0, LocalMapObject * param1, int par return 0; } -static int sub_02060FA8 (PlayerAvatar * param0, LocalMapObject * param1, int param2) +static int sub_02060FA8 (PlayerAvatar * param0, MapObject * param1, int param2) { if (param2 != -1) { FieldSystem * v0 = sub_02062C00(param1); @@ -1973,7 +1973,7 @@ static int sub_02060FA8 (PlayerAvatar * param0, LocalMapObject * param1, int par return 0; } -static int sub_02061058 (PlayerAvatar * param0, LocalMapObject * param1, int param2) +static int sub_02061058 (PlayerAvatar * param0, MapObject * param1, int param2) { if ((param2 != -1) && (sub_0205EB74(param0) == 0x1)) { FieldSystem * v0 = sub_02062C00(param1); @@ -2005,7 +2005,7 @@ static int sub_02061058 (PlayerAvatar * param0, LocalMapObject * param1, int par return 0; } -static int sub_02061100 (PlayerAvatar * param0, LocalMapObject * param1, int param2) +static int sub_02061100 (PlayerAvatar * param0, MapObject * param1, int param2) { u32 v0 = 0; FieldSystem * v1 = sub_02062C00(param1); @@ -2031,7 +2031,7 @@ static int sub_02061100 (PlayerAvatar * param0, LocalMapObject * param1, int par return v0; } -static int sub_02061180 (PlayerAvatar * param0, LocalMapObject * param1, int param2) +static int sub_02061180 (PlayerAvatar * param0, MapObject * param1, int param2) { if (param2 != -1) { FieldSystem * v0 = sub_02062C00(param1); @@ -2056,7 +2056,7 @@ static int sub_02061180 (PlayerAvatar * param0, LocalMapObject * param1, int par return 0; } -u32 sub_020611FC (PlayerAvatar * param0, LocalMapObject * param1, int param2) +u32 sub_020611FC (PlayerAvatar * param0, MapObject * param1, int param2) { u32 v0, v1 = 0; @@ -2081,7 +2081,7 @@ u32 sub_020611FC (PlayerAvatar * param0, LocalMapObject * param1, int param2) return v1; } -static int sub_02061248 (PlayerAvatar * param0, LocalMapObject * param1, int param2) +static int sub_02061248 (PlayerAvatar * param0, MapObject * param1, int param2) { BOOL v0 = 0; @@ -2187,7 +2187,7 @@ static int sub_02061348 (PlayerAvatar * param0, u16 param1, u16 param2) int sub_020613AC (PlayerAvatar * param0) { - LocalMapObject * v0 = Player_LocalMapObject(param0); + MapObject * v0 = Player_MapObject(param0); if (LocalMapObj_IsAnimationSet(v0) == 1) { return 1; @@ -2289,7 +2289,7 @@ u32 sub_0206147C (PlayerAvatar * param0, u16 param1, u16 param2, int param3, int } { - LocalMapObject * v3 = Player_LocalMapObject(param0); + MapObject * v3 = Player_MapObject(param0); u32 v4 = param5; if ((v4 & (1 << 2))) { @@ -2340,19 +2340,19 @@ u32 sub_0206147C (PlayerAvatar * param0, u16 param1, u16 param2, int param3, int int sub_02061544 (PlayerAvatar * param0) { - LocalMapObject * v0 = Player_LocalMapObject(param0); + MapObject * v0 = Player_MapObject(param0); return LocalMapObj_IsAnimationSet(v0); } void sub_02061550 (PlayerAvatar * param0, u32 param1, int param2) { - LocalMapObject * v0 = Player_LocalMapObject(param0); + MapObject * v0 = Player_MapObject(param0); sub_02060B64(param0, v0, param1, param2); } u32 sub_0206156C (PlayerAvatar * param0, int param1) { - LocalMapObject * v0 = Player_LocalMapObject(param0); + MapObject * v0 = Player_MapObject(param0); return sub_02064238(v0, param1); } @@ -2370,14 +2370,14 @@ void sub_020615AC (PlayerAvatar * param0, int * param1, int * param2) static void sub_020615C8 (PlayerAvatar * param0) { - LocalMapObject * v0 = Player_LocalMapObject(param0); + MapObject * v0 = Player_MapObject(param0); FieldSystem * v1 = sub_02062C00(v0); UnkStruct_0202CD88 * v2 = sub_0202CD88(v1->saveData); sub_0202CF28(v2, (0 + 0)); } -static int sub_020615E0 (PlayerAvatar * param0, LocalMapObject * param1, int param2) +static int sub_020615E0 (PlayerAvatar * param0, MapObject * param1, int param2) { if (param2 != -1) { u8 v0 = sub_02062BE8(param1); @@ -2417,7 +2417,7 @@ static int sub_02061630 (PlayerAvatar * param0, u32 param1, int param2) } { - LocalMapObject * v0 = Player_LocalMapObject(param0); + MapObject * v0 = Player_MapObject(param0); if (sub_0206413C(v0, param1) == 1) { return 1; @@ -2463,7 +2463,7 @@ u32 sub_020616F0 (PlayerAvatar * param0, int param1) if (sub_0205F158(param0) == 0) { v0 = sub_0206156C(param0, param1); } else { - LocalMapObject * v1 = Player_LocalMapObject(param0); + MapObject * v1 = Player_MapObject(param0); FieldSystem * v2 = sub_02062C00(v1); int v3 = sub_02063020(v1); int v4 = ((sub_02063030(v1) / 2)); @@ -2479,7 +2479,7 @@ u32 sub_020616F0 (PlayerAvatar * param0, int param1) u32 sub_02061760 (PlayerAvatar * param0) { u32 v0; - LocalMapObject * v1 = Player_LocalMapObject(param0); + MapObject * v1 = Player_MapObject(param0); FieldSystem * v2 = sub_02062C00(v1); int v3 = sub_02063020(v1); int v4 = ((sub_02063030(v1) / 2)); @@ -2497,7 +2497,7 @@ u32 sub_02061760 (PlayerAvatar * param0) void sub_020617BC (PlayerAvatar * const param0, int * param1, int * param2, int * param3) { int v0 = sub_0205EAA0(param0); - LocalMapObject * v1 = Player_LocalMapObject(param0); + MapObject * v1 = Player_MapObject(param0); *param1 = sub_02063020(v1); *param2 = ((sub_02063030(v1) / 2)); diff --git a/src/unk_02061804.c b/src/unk_02061804.c index ade4ed5bdf..943e2c737b 100644 --- a/src/unk_02061804.c +++ b/src/unk_02061804.c @@ -44,7 +44,7 @@ typedef struct UnkStruct_02061830_t { NARC * unk_14; UnkStruct_ov5_021ED0A4 unk_18; UnkStruct_02061830_sub1 * unk_120; - LocalMapObject * unk_124; + MapObject * unk_124; FieldSystem * unk_128; } MapObjectManager; @@ -100,7 +100,7 @@ typedef struct UnkStruct_02061AB4_t { u8 unk_E8[16]; u8 unk_F8[16]; u8 unk_108[32]; -} LocalMapObject; +} MapObject; typedef struct { int unk_00; @@ -111,39 +111,39 @@ typedef struct { } UnkStruct_020620C4; static MapObjectManager * sub_020618C8(int param0); -static void sub_02061D3C(FieldSystem * param0, LocalMapObject * param1, UnkStruct_02061D3C * param2); -static void sub_02061E80(LocalMapObject * param0, UnkStruct_02061D3C * param1); -static void sub_02061FA8(const MapObjectManager * param0, LocalMapObject * param1); -static void sub_02061FF0(LocalMapObject * param0); -static void sub_02062010(LocalMapObject * param0); +static void sub_02061D3C(FieldSystem * param0, MapObject * param1, UnkStruct_02061D3C * param2); +static void sub_02061E80(MapObject * param0, UnkStruct_02061D3C * param1); +static void sub_02061FA8(const MapObjectManager * param0, MapObject * param1); +static void sub_02061FF0(MapObject * param0); +static void sub_02062010(MapObject * param0); static void sub_020620C4(UnkStruct_020620C4 * param0); -static LocalMapObject * sub_02062120(const MapObjectManager * param0); -static LocalMapObject * sub_02062154(const MapObjectManager * param0, int param1, int param2); -static void sub_020621AC(const MapObjectManager * param0, LocalMapObject * param1); -static void sub_020621E8(LocalMapObject * param0, const UnkStruct_020619DC * param1, FieldSystem * param2); -static void sub_020622B8(LocalMapObject * param0, const UnkStruct_020619DC * param1); -static void sub_0206234C(LocalMapObject * param0, const MapObjectManager * param1); -static void sub_0206239C(LocalMapObject * param0); -static void sub_020623D4(LocalMapObject * param0); -static void sub_0206243C(LocalMapObject * param0); -static int sub_0206244C(const LocalMapObject * param0, int param1, int param2, const UnkStruct_020619DC * param3); -static LocalMapObject * sub_020624CC(const MapObjectManager * param0, int param1, int param2); -static void sub_02062604(LocalMapObject * param0); -static void sub_02062618(LocalMapObject * param0); -static void sub_02062628(LocalMapObject * param0); +static MapObject * sub_02062120(const MapObjectManager * param0); +static MapObject * sub_02062154(const MapObjectManager * param0, int param1, int param2); +static void sub_020621AC(const MapObjectManager * param0, MapObject * param1); +static void sub_020621E8(MapObject * param0, const UnkStruct_020619DC * param1, FieldSystem * param2); +static void sub_020622B8(MapObject * param0, const UnkStruct_020619DC * param1); +static void sub_0206234C(MapObject * param0, const MapObjectManager * param1); +static void sub_0206239C(MapObject * param0); +static void sub_020623D4(MapObject * param0); +static void sub_0206243C(MapObject * param0); +static int sub_0206244C(const MapObject * param0, int param1, int param2, const UnkStruct_020619DC * param3); +static MapObject * sub_020624CC(const MapObjectManager * param0, int param1, int param2); +static void sub_02062604(MapObject * param0); +static void sub_02062618(MapObject * param0); +static void sub_02062628(MapObject * param0); static int sub_0206262C(FieldSystem * param0, int param1); -static void sub_02062648(LocalMapObject * param0); -static void sub_02062660(LocalMapObject * param0); -static void sub_02062670(LocalMapObject * param0); -static void sub_020626D0(LocalMapObject * param0, const UnkStruct_020619DC * param1, int param2); -static void sub_02062714(LocalMapObject * param0, int param1, const UnkStruct_020619DC * param2); +static void sub_02062648(MapObject * param0); +static void sub_02062660(MapObject * param0); +static void sub_02062670(MapObject * param0); +static void sub_020626D0(MapObject * param0, const UnkStruct_020619DC * param1, int param2); +static void sub_02062714(MapObject * param0, int param1, const UnkStruct_020619DC * param2); static void sub_020627E8(SysTask * param0, void * param1); -static void sub_02062804(LocalMapObject * param0); +static void sub_02062804(MapObject * param0); static MapObjectManager * sub_0206281C(const MapObjectManager * param0); static void sub_02062828(MapObjectManager * param0); static void sub_02062830(MapObjectManager * param0); -static LocalMapObject * sub_02062870(const MapObjectManager * param0); -static MapObjectManager * sub_02062A48(const LocalMapObject * param0); +static MapObject * sub_02062870(const MapObjectManager * param0); +static MapObjectManager * sub_02062A48(const MapObject * param0); static const UnkStruct_020619DC * sub_020631A4(int param0, int param1, const UnkStruct_020619DC * param2); static int sub_020631D8(const UnkStruct_020619DC * param0); static int sub_020631F4(const UnkStruct_020619DC * param0); @@ -181,7 +181,7 @@ void sub_02061830 (MapObjectManager * param0) void sub_0206184C (MapObjectManager * param0, int param1, int param2, int param3, const UnkStruct_020619DC * param4) { int v0, v1 = sub_02062824(param0); - LocalMapObject * v2 = sub_02062878(param0); + MapObject * v2 = sub_02062878(param0); while (v1) { if (sub_02062CF8(v2) == 1) { @@ -192,7 +192,7 @@ void sub_0206184C (MapObjectManager * param0, int param1, int param2, int param3 if (sub_02062918(v2) != param2) { if (sub_020628D8( v2, (1 << 10)) == 0) { - LocalMapObj_Delete(v2); + MapObject_Delete(v2); } } break; @@ -213,7 +213,7 @@ void sub_0206184C (MapObjectManager * param0, int param1, int param2, int param3 static MapObjectManager * sub_020618C8 (int param0) { int v0; - LocalMapObject * v1; + MapObject * v1; MapObjectManager * v2; v2 = Heap_AllocFromHeap(11, (sizeof(MapObjectManager))); @@ -221,7 +221,7 @@ static MapObjectManager * sub_020618C8 (int param0) GF_ASSERT(v2 != NULL); memset(v2, 0, (sizeof(MapObjectManager))); - v0 = (sizeof(LocalMapObject)) * param0; + v0 = (sizeof(MapObject)) * param0; v1 = Heap_AllocFromHeap(11, v0); GF_ASSERT(v1 != NULL); @@ -232,9 +232,9 @@ static MapObjectManager * sub_020618C8 (int param0) return v2; } -LocalMapObject * sub_02061918 (const MapObjectManager * param0, const UnkStruct_020619DC * param1, int param2) +MapObject * sub_02061918 (const MapObjectManager * param0, const UnkStruct_020619DC * param1, int param2) { - LocalMapObject * v0; + MapObject * v0; UnkStruct_020619DC v1 = *param1; UnkStruct_020619DC * v2 = &v1; @@ -270,17 +270,17 @@ LocalMapObject * sub_02061918 (const MapObjectManager * param0, const UnkStruct_ sub_02062914(v0, param2); sub_02062660(v0); sub_02062670(v0); - sub_020628BC(v0, (1 << 2)); + MapObject_SetFlagOn(v0, (1 << 2)); sub_020621AC(param0, v0); sub_02062828(sub_0206281C(param0)); return v0; } -LocalMapObject * sub_020619DC (const MapObjectManager * param0, int param1, int param2, int param3, int param4, int param5, int param6) +MapObject * sub_020619DC (const MapObjectManager * param0, int param1, int param2, int param3, int param4, int param5, int param6) { UnkStruct_020619DC v0; - LocalMapObject * v1; + MapObject * v1; sub_020630F0(&v0, 0); sub_020630F8(&v0, param4); @@ -303,9 +303,9 @@ LocalMapObject * sub_020619DC (const MapObjectManager * param0, int param1, int return v1; } -LocalMapObject * sub_02061A74 (const MapObjectManager * param0, int param1, int param2, int param3, const UnkStruct_020619DC * param4) +MapObject * sub_02061A74 (const MapObjectManager * param0, int param1, int param2, int param3, const UnkStruct_020619DC * param4) { - LocalMapObject * v0 = NULL; + MapObject * v0 = NULL; const UnkStruct_020619DC * v1 = sub_020631A4(param1, param2, param4); if (v1 != NULL) { @@ -320,15 +320,15 @@ LocalMapObject * sub_02061A74 (const MapObjectManager * param0, int param1, int return v0; } -void sub_02061AB4 (LocalMapObject * param0, int param1) +void sub_02061AB4 (MapObject * param0, int param1) { sub_0206291C(param0, param1); sub_02062604(param0); - sub_020628C4(param0, (1 << 14)); + MapObject_SetFlagOff(param0, (1 << 14)); sub_02062670(param0); } -void sub_02061AD4 (LocalMapObject * param0, int param1) +void sub_02061AD4 (MapObject * param0, int param1) { if (sub_02062DFC(param0) == 1) { sub_02061B48(param0); @@ -337,7 +337,7 @@ void sub_02061AD4 (LocalMapObject * param0, int param1) sub_02061AB4(param0, param1); } -void LocalMapObj_Delete (LocalMapObject * param0) +void MapObject_Delete (MapObject * param0) { const MapObjectManager * v0; @@ -353,16 +353,16 @@ void LocalMapObj_Delete (LocalMapObject * param0) sub_0206243C(param0); } -void sub_02061B28 (LocalMapObject * param0) +void sub_02061B28 (MapObject * param0) { int v0; v0 = sub_02062958(param0); sub_0203F19C(sub_02062C00(param0), v0); - LocalMapObj_Delete(param0); + MapObject_Delete(param0); } -void sub_02061B48 (LocalMapObject * param0) +void sub_02061B48 (MapObject * param0) { const MapObjectManager * v0; @@ -373,7 +373,7 @@ void sub_02061B48 (LocalMapObject * param0) sub_02062B7C(param0); } - sub_020628C4(param0, (1 << 14)); + MapObject_SetFlagOff(param0, (1 << 14)); } sub_0206291C(param0, 0xffff); @@ -387,7 +387,7 @@ void sub_02061B48 (LocalMapObject * param0) void sub_02061BBC (MapObjectManager * param0) { int v0, v1; - LocalMapObject * v2; + MapObject * v2; v0 = 0; v1 = sub_02062824(param0); @@ -395,7 +395,7 @@ void sub_02061BBC (MapObjectManager * param0) do { if (sub_020628D0(v2, (1 << 0))) { - LocalMapObj_Delete(v2); + MapObject_Delete(v2); } v2++; @@ -409,7 +409,7 @@ void sub_02061BF0 (MapObjectManager * param0) { int v0, v1; - LocalMapObject * v2; + MapObject * v2; v0 = 0; v1 = sub_02062824(param0); @@ -436,7 +436,7 @@ void sub_02061C48 (MapObjectManager * param0) { int v0 = 0; int v1 = sub_02062824(param0); - LocalMapObject * v2 = sub_02062878(param0); + MapObject * v2 = sub_02062878(param0); do { if (sub_02062CF8(v2) == 1) { @@ -459,7 +459,7 @@ void sub_02061C48 (MapObjectManager * param0) void sub_02061CA8 (FieldSystem * param0, const MapObjectManager * param1, UnkStruct_02061D3C * param2, int param3) { int v0 = 0; - LocalMapObject * v1; + MapObject * v1; while (sub_020625B0(param1, &v1, &v0, (1 << 0))) { sub_02061D3C(param0, v1, param2); @@ -475,7 +475,7 @@ void sub_02061CA8 (FieldSystem * param0, const MapObjectManager * param1, UnkStr void sub_02061D04 (const MapObjectManager * param0, UnkStruct_02061D3C * param1, int param2) { int v0 = 0; - LocalMapObject * v1; + MapObject * v1; while (param2) { if ((param1->unk_00 & (1 << 0))) { @@ -491,7 +491,7 @@ void sub_02061D04 (const MapObjectManager * param0, UnkStruct_02061D3C * param1, } } -static void sub_02061D3C (FieldSystem * param0, LocalMapObject * param1, UnkStruct_02061D3C * param2) +static void sub_02061D3C (FieldSystem * param0, MapObject * param1, UnkStruct_02061D3C * param2) { param2->unk_00 = sub_020628B8(param1); param2->unk_04 = sub_020628EC(param1); @@ -542,7 +542,7 @@ static void sub_02061D3C (FieldSystem * param0, LocalMapObject * param1, UnkStru memcpy(param2->unk_40, sub_02062AA0(param1), 16); } -static void sub_02061E80 (LocalMapObject * param0, UnkStruct_02061D3C * param1) +static void sub_02061E80 (MapObject * param0, UnkStruct_02061D3C * param1) { sub_020628B4(param0, param1->unk_00); sub_020628E8(param0, param1->unk_04); @@ -579,7 +579,7 @@ static void sub_02061E80 (LocalMapObject * param0, UnkStruct_02061D3C * param1) memcpy(sub_02062AA0(param0), param1->unk_40, 16); } -static void sub_02061FA8 (const MapObjectManager * param0, LocalMapObject * param1) +static void sub_02061FA8 (const MapObjectManager * param0, MapObject * param1) { sub_02061FF0(param1); sub_02062010(param1); @@ -592,14 +592,14 @@ static void sub_02061FA8 (const MapObjectManager * param0, LocalMapObject * para sub_02062828(sub_0206281C(param0)); } -static void sub_02061FF0 (LocalMapObject * param0) +static void sub_02061FF0 (MapObject * param0) { - sub_020628BC(param0, (1 << 0) | (1 << 2)); - sub_020628C4(param0, (1 << 6) | (1 << 9) | (1 << 14) | (1 << 16) | (1 << 17) | (1 << 3) | (1 << 18) | (1 << 19) | (1 << 21) | (1 << 22) | (1 << 23)); + MapObject_SetFlagOn(param0, (1 << 0) | (1 << 2)); + MapObject_SetFlagOff(param0, (1 << 6) | (1 << 9) | (1 << 14) | (1 << 16) | (1 << 17) | (1 << 3) | (1 << 18) | (1 << 19) | (1 << 21) | (1 << 22) | (1 << 23)); sub_02062618(param0); } -static void sub_02062010 (LocalMapObject * param0) +static void sub_02062010 (MapObject * param0) { int v0; VecFx32 v1; @@ -648,7 +648,7 @@ void sub_02062068 (const MapObjectManager * param0, int param1, int param2, cons static void sub_020620C4 (UnkStruct_020620C4 * param0) { - LocalMapObject * v0; + MapObject * v0; FieldSystem * v1; const UnkStruct_020619DC * v2; @@ -669,10 +669,10 @@ static void sub_020620C4 (UnkStruct_020620C4 * param0) Heap_FreeToHeapExplicit(11, param0); } -static LocalMapObject * sub_02062120 (const MapObjectManager * param0) +static MapObject * sub_02062120 (const MapObjectManager * param0) { int v0, v1; - LocalMapObject * v2; + MapObject * v2; v0 = 0; v1 = sub_02062824(param0); @@ -690,10 +690,10 @@ static LocalMapObject * sub_02062120 (const MapObjectManager * param0) return NULL; } -static LocalMapObject * sub_02062154 (const MapObjectManager * param0, int param1, int param2) +static MapObject * sub_02062154 (const MapObjectManager * param0, int param1, int param2) { int v0 = 0; - LocalMapObject * v1; + MapObject * v1; while (sub_020625B0(param0, &v1, &v0, (1 << 0)) == 1) { if (sub_02062E94(v1) == 1) { @@ -708,7 +708,7 @@ static LocalMapObject * sub_02062154 (const MapObjectManager * param0, int param return NULL; } -static void sub_020621AC (const MapObjectManager * param0, LocalMapObject * param1) +static void sub_020621AC (const MapObjectManager * param0, MapObject * param1) { int v0, v1; SysTask * v2; @@ -726,7 +726,7 @@ static void sub_020621AC (const MapObjectManager * param0, LocalMapObject * para sub_02062A1C(param1, v2); } -static void sub_020621E8 (LocalMapObject * param0, const UnkStruct_020619DC * param1, FieldSystem * param2) +static void sub_020621E8 (MapObject * param0, const UnkStruct_020619DC * param1, FieldSystem * param2) { LocalMapObj_SetId(param0, sub_020630F4(param1)); sub_0206291C(param0, sub_0206262C(param2, sub_020630FC(param1))); @@ -743,7 +743,7 @@ static void sub_020621E8 (LocalMapObject * param0, const UnkStruct_020619DC * pa sub_020622B8(param0, param1); } -static void sub_020622B8 (LocalMapObject * param0, const UnkStruct_020619DC * param1) +static void sub_020622B8 (MapObject * param0, const UnkStruct_020619DC * param1) { int v0; VecFx32 v1; @@ -772,9 +772,9 @@ static void sub_020622B8 (LocalMapObject * param0, const UnkStruct_020619DC * pa sub_02063060(param0, &v1); } -static void sub_0206234C (LocalMapObject * param0, const MapObjectManager * param1) +static void sub_0206234C (MapObject * param0, const MapObjectManager * param1) { - sub_020628BC(param0, (1 << 0) | (1 << 12) | (1 << 11)); + MapObject_SetFlagOn(param0, (1 << 0) | (1 << 12) | (1 << 11)); if (sub_020626B4(param0) == 1) { sub_02062E78(param0, 1); @@ -786,7 +786,7 @@ static void sub_0206234C (LocalMapObject * param0, const MapObjectManager * para sub_020656DC(param0); } -static void sub_0206239C (LocalMapObject * param0) +static void sub_0206239C (MapObject * param0) { const UnkStruct_020EDF0C * v0; @@ -797,7 +797,7 @@ static void sub_0206239C (LocalMapObject * param0) sub_02062B20(param0, sub_0206322C(v0)); } -static void sub_020623D4 (LocalMapObject * param0) +static void sub_020623D4 (MapObject * param0) { const UnkStruct_ov5_021FB0F0 * v0; u32 v1 = sub_02062920(param0); @@ -815,12 +815,12 @@ static void sub_020623D4 (LocalMapObject * param0) sub_02062B9C(param0, sub_02063240(v0)); } -static void sub_0206243C (LocalMapObject * param0) +static void sub_0206243C (MapObject * param0) { - memset(param0, 0, (sizeof(LocalMapObject))); + memset(param0, 0, (sizeof(MapObject))); } -static int sub_0206244C (const LocalMapObject * param0, int param1, int param2, const UnkStruct_020619DC * param3) +static int sub_0206244C (const MapObject * param0, int param1, int param2, const UnkStruct_020619DC * param3) { int v0; int v1; @@ -855,10 +855,10 @@ static int sub_0206244C (const LocalMapObject * param0, int param1, int param2, return 0; } -static LocalMapObject * sub_020624CC (const MapObjectManager * param0, int param1, int param2) +static MapObject * sub_020624CC (const MapObjectManager * param0, int param1, int param2) { int v0 = 0; - LocalMapObject * v1; + MapObject * v1; while (sub_020625B0(param0, &v1, &v0, (1 << 0)) == 1) { if ((sub_02062910(v1) == param1) && (sub_02062918(v1) == param2)) { @@ -869,10 +869,10 @@ static LocalMapObject * sub_020624CC (const MapObjectManager * param0, int param return NULL; } -LocalMapObject * MapObjMan_LocalMapObjByIndex (const MapObjectManager * param0, int param1) +MapObject * MapObjMan_LocalMapObjByIndex (const MapObjectManager * param0, int param1) { int v0; - LocalMapObject * v1; + MapObject * v1; GF_ASSERT(param0 != NULL); @@ -895,10 +895,10 @@ LocalMapObject * MapObjMan_LocalMapObjByIndex (const MapObjectManager * param0, return NULL; } -LocalMapObject * sub_02062570 (const MapObjectManager * param0, int param1) +MapObject * sub_02062570 (const MapObjectManager * param0, int param1) { int v0; - LocalMapObject * v1; + MapObject * v1; v0 = sub_02062824(param0); v1 = sub_02062870(param0); @@ -917,10 +917,10 @@ LocalMapObject * sub_02062570 (const MapObjectManager * param0, int param1) return NULL; } -int sub_020625B0 (const MapObjectManager * param0, LocalMapObject ** param1, int * param2, u32 param3) +int sub_020625B0 (const MapObjectManager * param0, MapObject ** param1, int * param2, u32 param3) { int v0; - LocalMapObject * v1; + MapObject * v1; v0 = sub_02062824(param0); @@ -945,18 +945,18 @@ int sub_020625B0 (const MapObjectManager * param0, LocalMapObject ** param1, int return 0; } -static void sub_02062604 (LocalMapObject * param0) +static void sub_02062604 (MapObject * param0) { - sub_020628BC(param0, (1 << 2)); + MapObject_SetFlagOn(param0, (1 << 2)); sub_02062618(param0); } -static void sub_02062618 (LocalMapObject * param0) +static void sub_02062618 (MapObject * param0) { - sub_020628C4(param0, (1 << 15) | (1 << 20) | (1 << 26) | (1 << 24)); + MapObject_SetFlagOff(param0, (1 << 15) | (1 << 20) | (1 << 26) | (1 << 24)); } -static void sub_02062628 (LocalMapObject * param0) +static void sub_02062628 (MapObject * param0) { (void)0; } @@ -971,20 +971,20 @@ static int sub_0206262C (FieldSystem * param0, int param1) return param1; } -static void sub_02062648 (LocalMapObject * param0) +static void sub_02062648 (MapObject * param0) { if (sub_020628D0(param0, (1 << 12))) { sub_020642F8(param0); } } -static void sub_02062660 (LocalMapObject * param0) +static void sub_02062660 (MapObject * param0) { sub_0206239C(param0); sub_02063400(param0); } -static void sub_02062670 (LocalMapObject * param0) +static void sub_02062670 (MapObject * param0) { const MapObjectManager * v0 = sub_02062A40(param0); @@ -1003,7 +1003,7 @@ static void sub_02062670 (LocalMapObject * param0) } } -int sub_020626B4 (const LocalMapObject * param0) +int sub_020626B4 (const MapObject * param0) { u16 v0 = (u16)sub_02062960(param0); @@ -1014,7 +1014,7 @@ int sub_020626B4 (const LocalMapObject * param0) return 0; } -static void sub_020626D0 (LocalMapObject * param0, const UnkStruct_020619DC * param1, int param2) +static void sub_020626D0 (MapObject * param0, const UnkStruct_020619DC * param1, int param2) { GF_ASSERT(sub_02062E94(param0) == 1); @@ -1024,7 +1024,7 @@ static void sub_020626D0 (LocalMapObject * param0, const UnkStruct_020619DC * pa sub_02062954(param0, sub_02063114(param1)); } -static void sub_02062714 (LocalMapObject * param0, int param1, const UnkStruct_020619DC * param2) +static void sub_02062714 (MapObject * param0, int param1, const UnkStruct_020619DC * param2) { GF_ASSERT(sub_020631D8(param2) == 1); @@ -1034,7 +1034,7 @@ static void sub_02062714 (LocalMapObject * param0, int param1, const UnkStruct_0 sub_02062914(param0, param1); } -int sub_02062758 (const LocalMapObject * param0, int param1) +int sub_02062758 (const MapObject * param0, int param1) { int v0; @@ -1044,7 +1044,7 @@ int sub_02062758 (const LocalMapObject * param0, int param1) return v0; } -int sub_02062764 (const LocalMapObject * param0, int param1, int param2) +int sub_02062764 (const MapObject * param0, int param1, int param2) { if (sub_020628D8(param0, (1 << 0)) == 0) { return 0; @@ -1067,7 +1067,7 @@ int sub_02062764 (const LocalMapObject * param0, int param1, int param2) return 1; } -int sub_020627B4 (const LocalMapObject * param0, int param1, int param2, int param3) +int sub_020627B4 (const MapObject * param0, int param1, int param2, int param3) { if (sub_020628D8(param0, (1 << 0)) == 0) { return 0; @@ -1086,7 +1086,7 @@ int sub_020627B4 (const LocalMapObject * param0, int param1, int param2, int par static void sub_020627E8 (SysTask * param0, void * param1) { - LocalMapObject * v0 = (LocalMapObject *)param1; + MapObject * v0 = (MapObject *)param1; sub_02063410(v0); @@ -1097,7 +1097,7 @@ static void sub_020627E8 (SysTask * param0, void * param1) sub_02062804(v0); } -static void sub_02062804 (LocalMapObject * param0) +static void sub_02062804 (MapObject * param0) { const MapObjectManager * v0 = sub_02062A40(param0); @@ -1161,27 +1161,27 @@ UnkStruct_ov5_021ED0A4 * sub_0206285C (const MapObjectManager * param0) return &(((MapObjectManager *)param0)->unk_18); } -void sub_02062860 (MapObjectManager * param0, LocalMapObject * param1) +void sub_02062860 (MapObjectManager * param0, MapObject * param1) { param0->unk_124 = param1; } -const LocalMapObject * sub_02062868 (const MapObjectManager * param0) +const MapObject * sub_02062868 (const MapObjectManager * param0) { return param0->unk_124; } -static LocalMapObject * sub_02062870 (const MapObjectManager * param0) +static MapObject * sub_02062870 (const MapObjectManager * param0) { return param0->unk_124; } -LocalMapObject * sub_02062878 (const MapObjectManager * param0) +MapObject * sub_02062878 (const MapObjectManager * param0) { return param0->unk_124; } -void sub_02062880 (const LocalMapObject ** param0) +void sub_02062880 (const MapObject ** param0) { (*param0)++; } @@ -1207,32 +1207,32 @@ NARC * sub_020628A0 (const MapObjectManager * param0) return ((MapObjectManager *)param0)->unk_14; } -void sub_020628B4 (LocalMapObject * param0, u32 param1) +void sub_020628B4 (MapObject * param0, u32 param1) { param0->unk_00 = param1; } -u32 sub_020628B8 (const LocalMapObject * param0) +u32 sub_020628B8 (const MapObject * param0) { return param0->unk_00; } -void sub_020628BC (LocalMapObject * param0, u32 param1) +void MapObject_SetFlagOn (MapObject * param0, u32 param1) { param0->unk_00 |= param1; } -void sub_020628C4 (LocalMapObject * param0, u32 param1) +void MapObject_SetFlagOff (MapObject * param0, u32 param1) { param0->unk_00 &= ~param1; } -u32 sub_020628D0 (const LocalMapObject * param0, u32 param1) +u32 sub_020628D0 (const MapObject * param0, u32 param1) { return param0->unk_00 & param1; } -u32 sub_020628D8 (const LocalMapObject * param0, u32 param1) +u32 sub_020628D8 (const MapObject * param0, u32 param1) { if ((param0->unk_00 & param1)) { return 1; @@ -1241,62 +1241,62 @@ u32 sub_020628D8 (const LocalMapObject * param0, u32 param1) return 0; } -void sub_020628E8 (LocalMapObject * param0, u32 param1) +void sub_020628E8 (MapObject * param0, u32 param1) { param0->unk_04 = param1; } -u32 sub_020628EC (const LocalMapObject * param0) +u32 sub_020628EC (const MapObject * param0) { return param0->unk_04; } -void sub_020628F0 (LocalMapObject * param0, u32 param1) +void sub_020628F0 (MapObject * param0, u32 param1) { param0->unk_04 |= param1; } -void sub_020628F8 (LocalMapObject * param0, u32 param1) +void sub_020628F8 (MapObject * param0, u32 param1) { param0->unk_04 &= ~param1; } -u32 sub_02062904 (const LocalMapObject * param0, u32 param1) +u32 sub_02062904 (const MapObject * param0, u32 param1) { return(param0->unk_04 & param1); } -void LocalMapObj_SetId (LocalMapObject * param0, u32 param1) +void LocalMapObj_SetId (MapObject * param0, u32 param1) { param0->unk_08 = param1; } -u32 sub_02062910 (const LocalMapObject * param0) +u32 sub_02062910 (const MapObject * param0) { return param0->unk_08; } -void sub_02062914 (LocalMapObject * param0, int param1) +void sub_02062914 (MapObject * param0, int param1) { param0->unk_0C = param1; } -int sub_02062918 (const LocalMapObject * param0) +int sub_02062918 (const MapObject * param0) { return param0->unk_0C; } -void sub_0206291C (LocalMapObject * param0, u32 param1) +void sub_0206291C (MapObject * param0, u32 param1) { param0->unk_10 = param1; } -u32 sub_02062920 (const LocalMapObject * param0) +u32 sub_02062920 (const MapObject * param0) { return param0->unk_10; } -u32 sub_02062924 (const LocalMapObject * param0) +u32 sub_02062924 (const MapObject * param0) { u32 v0 = sub_02062920(param0); @@ -1307,63 +1307,63 @@ u32 sub_02062924 (const LocalMapObject * param0) return v0; } -void sub_02062944 (LocalMapObject * param0, u32 param1) +void sub_02062944 (MapObject * param0, u32 param1) { param0->unk_14 = param1; } -u32 sub_02062948 (const LocalMapObject * param0) +u32 sub_02062948 (const MapObject * param0) { return param0->unk_14; } -void sub_0206294C (LocalMapObject * param0, u32 param1) +void sub_0206294C (MapObject * param0, u32 param1) { param0->unk_18 = param1; } -u32 sub_02062950 (const LocalMapObject * param0) +u32 sub_02062950 (const MapObject * param0) { return param0->unk_18; } -void sub_02062954 (LocalMapObject * param0, u32 param1) +void sub_02062954 (MapObject * param0, u32 param1) { param0->unk_1C = param1; } -u32 sub_02062958 (const LocalMapObject * param0) +u32 sub_02062958 (const MapObject * param0) { return param0->unk_1C; } -void sub_0206295C (LocalMapObject * param0, u32 param1) +void sub_0206295C (MapObject * param0, u32 param1) { param0->unk_20 = param1; } -u32 sub_02062960 (const LocalMapObject * param0) +u32 sub_02062960 (const MapObject * param0) { return param0->unk_20; } -void sub_02062964 (LocalMapObject * param0, int param1) +void sub_02062964 (MapObject * param0, int param1) { param0->unk_24 = param1; } -u32 sub_02062968 (const LocalMapObject * param0) +u32 sub_02062968 (const MapObject * param0) { return param0->unk_24; } -void sub_0206296C (LocalMapObject * param0, int param1) +void sub_0206296C (MapObject * param0, int param1) { param0->unk_30 = param0->unk_28; param0->unk_28 = param1; } -void sub_02062974 (LocalMapObject * param0, int param1) +void sub_02062974 (MapObject * param0, int param1) { if (sub_020628D0(param0, (1 << 7)) == 0) { param0->unk_30 = param0->unk_28; @@ -1371,34 +1371,34 @@ void sub_02062974 (LocalMapObject * param0, int param1) } } -int sub_0206298C (const LocalMapObject * param0) +int sub_0206298C (const MapObject * param0) { return param0->unk_28; } -int sub_02062990 (const LocalMapObject * param0) +int sub_02062990 (const MapObject * param0) { return param0->unk_30; } -void sub_02062994 (LocalMapObject * param0, int param1) +void sub_02062994 (MapObject * param0, int param1) { param0->unk_34 = param0->unk_2C; param0->unk_2C = param1; } -int sub_0206299C (const LocalMapObject * param0) +int sub_0206299C (const MapObject * param0) { return param0->unk_2C; } -void sub_020629A0 (LocalMapObject * param0, int param1) +void sub_020629A0 (MapObject * param0, int param1) { sub_02062974(param0, param1); sub_02062994(param0, param1); } -void sub_020629B4 (LocalMapObject * param0, int param1, int param2) +void sub_020629B4 (MapObject * param0, int param1, int param2) { switch (param2) { case 0: @@ -1415,7 +1415,7 @@ void sub_020629B4 (LocalMapObject * param0, int param1, int param2) } } -int sub_020629D8 (const LocalMapObject * param0, int param1) +int sub_020629D8 (const MapObject * param0, int param1) { switch (param1) { case 0: @@ -1430,67 +1430,67 @@ int sub_020629D8 (const LocalMapObject * param0, int param1) return 0; } -void sub_020629FC (LocalMapObject * param0, int param1) +void sub_020629FC (MapObject * param0, int param1) { param0->unk_44 = param1; } -int sub_02062A00 (const LocalMapObject * param0) +int sub_02062A00 (const MapObject * param0) { return param0->unk_44; } -void sub_02062A04 (LocalMapObject * param0, int param1) +void sub_02062A04 (MapObject * param0, int param1) { param0->unk_48 = param1; } -int sub_02062A08 (const LocalMapObject * param0) +int sub_02062A08 (const MapObject * param0) { return param0->unk_48; } -void sub_02062A0C (LocalMapObject * param0, u32 param1) +void sub_02062A0C (MapObject * param0, u32 param1) { param0->unk_A0 = param1; } -u32 sub_02062A14 (const LocalMapObject * param0) +u32 sub_02062A14 (const MapObject * param0) { return param0->unk_A0; } -void sub_02062A1C (LocalMapObject * param0, SysTask * param1) +void sub_02062A1C (MapObject * param0, SysTask * param1) { param0->unk_B0 = param1; } -SysTask * sub_02062A24 (const LocalMapObject * param0) +SysTask * sub_02062A24 (const MapObject * param0) { return param0->unk_B0; } -void sub_02062A2C (const LocalMapObject * param0) +void sub_02062A2C (const MapObject * param0) { SysTask_Done(sub_02062A24(param0)); } -void sub_02062A38 (LocalMapObject * param0, const MapObjectManager * param1) +void sub_02062A38 (MapObject * param0, const MapObjectManager * param1) { param0->unk_B4 = param1; } -const MapObjectManager * sub_02062A40 (const LocalMapObject * param0) +const MapObjectManager * sub_02062A40 (const MapObject * param0) { return param0->unk_B4; } -static MapObjectManager * sub_02062A48 (const LocalMapObject * param0) +static MapObjectManager * sub_02062A48 (const MapObject * param0) { return sub_0206281C(param0->unk_B4); } -void * sub_02062A54 (LocalMapObject * param0, int param1) +void * sub_02062A54 (MapObject * param0, int param1) { void * v0; @@ -1502,12 +1502,12 @@ void * sub_02062A54 (LocalMapObject * param0, int param1) return v0; } -void * sub_02062A78 (LocalMapObject * param0) +void * sub_02062A78 (MapObject * param0) { return param0->unk_D8; } -void * sub_02062A7C (LocalMapObject * param0, int param1) +void * sub_02062A7C (MapObject * param0, int param1) { u8 * v0; @@ -1519,12 +1519,12 @@ void * sub_02062A7C (LocalMapObject * param0, int param1) return v0; } -void * sub_02062AA0 (LocalMapObject * param0) +void * sub_02062AA0 (MapObject * param0) { return param0->unk_E8; } -void * sub_02062AA4 (LocalMapObject * param0, int param1) +void * sub_02062AA4 (MapObject * param0, int param1) { u8 * v0; @@ -1536,12 +1536,12 @@ void * sub_02062AA4 (LocalMapObject * param0, int param1) return v0; } -void * sub_02062AC8 (LocalMapObject * param0) +void * sub_02062AC8 (MapObject * param0) { return param0->unk_F8; } -void * sub_02062ACC (LocalMapObject * param0, int param1) +void * sub_02062ACC (MapObject * param0, int param1) { u8 * v0; @@ -1553,143 +1553,143 @@ void * sub_02062ACC (LocalMapObject * param0, int param1) return v0; } -void * sub_02062AF0 (LocalMapObject * param0) +void * sub_02062AF0 (MapObject * param0) { return param0->unk_108; } -void sub_02062AF8 (LocalMapObject * param0, UnkFuncPtr_020EDF0C param1) +void sub_02062AF8 (MapObject * param0, UnkFuncPtr_020EDF0C param1) { param0->unk_B8 = param1; } -void sub_02062B00 (LocalMapObject * param0) +void sub_02062B00 (MapObject * param0) { param0->unk_B8(param0); } -void sub_02062B0C (LocalMapObject * param0, UnkFuncPtr_020EDF0C_1 param1) +void sub_02062B0C (MapObject * param0, UnkFuncPtr_020EDF0C_1 param1) { param0->unk_BC = param1; } -void sub_02062B14 (LocalMapObject * param0) +void sub_02062B14 (MapObject * param0) { param0->unk_BC(param0); } -void sub_02062B20 (LocalMapObject * param0, UnkFuncPtr_020EDF0C_2 param1) +void sub_02062B20 (MapObject * param0, UnkFuncPtr_020EDF0C_2 param1) { param0->unk_C0 = param1; } -void sub_02062B28 (LocalMapObject * param0) +void sub_02062B28 (MapObject * param0) { param0->unk_C0(param0); } -void sub_02062B34 (LocalMapObject * param0) +void sub_02062B34 (MapObject * param0) { const UnkStruct_020EDF0C * v0 = sub_0206320C(sub_02062948(param0)); v0->unk_10(param0); } -void sub_02062B4C (LocalMapObject * param0, UnkFuncPtr_ov5_021FB0F0 param1) +void sub_02062B4C (MapObject * param0, UnkFuncPtr_ov5_021FB0F0 param1) { param0->unk_C4 = param1; } -void sub_02062B54 (LocalMapObject * param0) +void sub_02062B54 (MapObject * param0) { param0->unk_C4(param0); } -void sub_02062B60 (LocalMapObject * param0, UnkFuncPtr_ov5_021FB0F0_1 param1) +void sub_02062B60 (MapObject * param0, UnkFuncPtr_ov5_021FB0F0_1 param1) { param0->unk_C8 = param1; } -void sub_02062B68 (LocalMapObject * param0) +void sub_02062B68 (MapObject * param0) { param0->unk_C8(param0); } -void sub_02062B74 (LocalMapObject * param0, UnkFuncPtr_ov5_021FB0F0_2 param1) +void sub_02062B74 (MapObject * param0, UnkFuncPtr_ov5_021FB0F0_2 param1) { param0->unk_CC = param1; } -void sub_02062B7C (LocalMapObject * param0) +void sub_02062B7C (MapObject * param0) { param0->unk_CC(param0); } -void sub_02062B88 (LocalMapObject * param0, UnkFuncPtr_ov5_021FB0F0_3 param1) +void sub_02062B88 (MapObject * param0, UnkFuncPtr_ov5_021FB0F0_3 param1) { param0->unk_D0 = param1; } -void sub_02062B90 (LocalMapObject * param0) +void sub_02062B90 (MapObject * param0) { param0->unk_D0(param0); } -void sub_02062B9C (LocalMapObject * param0, UnkFuncPtr_ov5_021FB0F0_4 param1) +void sub_02062B9C (MapObject * param0, UnkFuncPtr_ov5_021FB0F0_4 param1) { param0->unk_D4 = param1; } -void sub_02062BA4 (LocalMapObject * param0) +void sub_02062BA4 (MapObject * param0) { param0->unk_D4(param0); } -void sub_02062BB0 (LocalMapObject * param0, int param1) +void sub_02062BB0 (MapObject * param0, int param1) { param0->unk_A4 = param1; } -int sub_02062BB8 (const LocalMapObject * param0) +int sub_02062BB8 (const MapObject * param0) { return param0->unk_A4; } -void sub_02062BC0 (LocalMapObject * param0, int param1) +void sub_02062BC0 (MapObject * param0, int param1) { param0->unk_A8 = param1; } -void sub_02062BC8 (LocalMapObject * param0) +void sub_02062BC8 (MapObject * param0) { param0->unk_A8++; } -int sub_02062BD8 (const LocalMapObject * param0) +int sub_02062BD8 (const MapObject * param0) { return param0->unk_A8; } -void sub_02062BE0 (LocalMapObject * param0, u32 param1) +void sub_02062BE0 (MapObject * param0, u32 param1) { param0->unk_AC = param1; } -u32 sub_02062BE8 (const LocalMapObject * param0) +u32 sub_02062BE8 (const MapObject * param0) { return param0->unk_AC; } -void sub_02062BF0 (LocalMapObject * param0, u32 param1) +void sub_02062BF0 (MapObject * param0, u32 param1) { param0->unk_AE = param1; } -u32 sub_02062BF8 (const LocalMapObject * param0) +u32 sub_02062BF8 (const MapObject * param0) { return param0->unk_AE; } -FieldSystem * sub_02062C00 (const LocalMapObject * param0) +FieldSystem * sub_02062C00 (const MapObject * param0) { MapObjectManager * v0; @@ -1697,12 +1697,12 @@ FieldSystem * sub_02062C00 (const LocalMapObject * param0) return sub_02062894(v0); } -int sub_02062C0C (const LocalMapObject * param0) +int sub_02062C0C (const MapObject * param0) { return sub_02062858(sub_02062A40(param0)); } -int sub_02062C18 (const LocalMapObject * param0) +int sub_02062C18 (const MapObject * param0) { GF_ASSERT(sub_02062E94(param0) == 1); return sub_02062958(param0); @@ -1721,7 +1721,7 @@ void sub_02062C3C (MapObjectManager * param0) void MapObjectMan_PauseAllMovement (MapObjectManager * param0) { int v0 = sub_02062824(param0); - LocalMapObject * v1 = sub_02062878(param0); + MapObject * v1 = sub_02062878(param0); do { if (sub_02062CF8(v1)) { @@ -1736,7 +1736,7 @@ void MapObjectMan_PauseAllMovement (MapObjectManager * param0) void MapObjectMan_UnpauseAllMovement (MapObjectManager * param0) { int v0 = sub_02062824(param0); - LocalMapObject * v1 = sub_02062878(param0); + MapObject * v1 = sub_02062878(param0); do { if (sub_02062CF8(v1)) { @@ -1757,7 +1757,7 @@ int sub_02062CA8 (const MapObjectManager * param0) return 0; } -u32 sub_02062CBC (const LocalMapObject * param0, u32 param1) +u32 sub_02062CBC (const MapObject * param0, u32 param1) { const MapObjectManager * v0 = sub_02062A40(param0); @@ -1782,70 +1782,70 @@ int sub_02062CE4 (const MapObjectManager * param0) return 1; } -int sub_02062CF8 (const LocalMapObject * param0) +int sub_02062CF8 (const MapObject * param0) { return sub_020628D8(param0, (1 << 0)); } -void sub_02062D04 (LocalMapObject * param0) +void sub_02062D04 (MapObject * param0) { - sub_020628BC(param0, (1 << 1)); + MapObject_SetFlagOn(param0, (1 << 1)); } -void sub_02062D10 (LocalMapObject * param0) +void sub_02062D10 (MapObject * param0) { - sub_020628C4(param0, (1 << 1)); + MapObject_SetFlagOff(param0, (1 << 1)); } -int sub_02062D1C (const LocalMapObject * param0) +int sub_02062D1C (const MapObject * param0) { return sub_020628D8(param0, (1 << 1)); } -void sub_02062D28 (LocalMapObject * param0) +void sub_02062D28 (MapObject * param0) { - sub_020628BC(param0, (1 << 2)); + MapObject_SetFlagOn(param0, (1 << 2)); } -void sub_02062D34 (LocalMapObject * param0) +void sub_02062D34 (MapObject * param0) { - sub_020628C4(param0, (1 << 3)); + MapObject_SetFlagOff(param0, (1 << 3)); } -void sub_02062D40 (LocalMapObject * param0) +void sub_02062D40 (MapObject * param0) { - sub_020628BC(param0, (1 << 14)); + MapObject_SetFlagOn(param0, (1 << 14)); } -int sub_02062D4C (const LocalMapObject * param0) +int sub_02062D4C (const MapObject * param0) { return sub_020628D8(param0, (1 << 14)); } -int sub_02062D58 (const LocalMapObject * param0) +int sub_02062D58 (const MapObject * param0) { return sub_020628D8(param0, (1 << 9)); } -void sub_02062D64 (LocalMapObject * param0, int param1) +void sub_02062D64 (MapObject * param0, int param1) { if (param1 == 1) { - sub_020628BC(param0, (1 << 9)); + MapObject_SetFlagOn(param0, (1 << 9)); } else { - sub_020628C4(param0, (1 << 9)); + MapObject_SetFlagOff(param0, (1 << 9)); } } -void sub_02062D80 (LocalMapObject * param0, int param1) +void sub_02062D80 (MapObject * param0, int param1) { if (param1 == 1) { - sub_020628C4(param0, (1 << 18)); + MapObject_SetFlagOff(param0, (1 << 18)); } else { - sub_020628BC(param0, (1 << 18)); + MapObject_SetFlagOn(param0, (1 << 18)); } } -int sub_02062D9C (LocalMapObject * param0) +int sub_02062D9C (MapObject * param0) { if (sub_020628D8(param0, (1 << 19)) == 1) { return 0; @@ -1854,26 +1854,26 @@ int sub_02062D9C (LocalMapObject * param0) return 1; } -void sub_02062DB4 (LocalMapObject * param0, int param1) +void sub_02062DB4 (MapObject * param0, int param1) { if (param1 == 1) { - sub_020628BC(param0, (1 << 19)); + MapObject_SetFlagOn(param0, (1 << 19)); } else { - sub_020628C4(param0, (1 << 19)); + MapObject_SetFlagOff(param0, (1 << 19)); } } -void sub_02062DD0 (LocalMapObject * param0) +void sub_02062DD0 (MapObject * param0) { - sub_020628BC(param0, (1 << 6)); + MapObject_SetFlagOn(param0, (1 << 6)); } -void sub_02062DDC (LocalMapObject * param0) +void sub_02062DDC (MapObject * param0) { - sub_020628C4(param0, (1 << 6)); + MapObject_SetFlagOff(param0, (1 << 6)); } -int sub_02062DE8 (const LocalMapObject * param0) +int sub_02062DE8 (const MapObject * param0) { if (sub_020628D8(param0, (1 << 6)) == 1) { return 1; @@ -1882,7 +1882,7 @@ int sub_02062DE8 (const LocalMapObject * param0) return 0; } -int sub_02062DFC (const LocalMapObject * param0) +int sub_02062DFC (const MapObject * param0) { const MapObjectManager * v0; @@ -1899,16 +1899,16 @@ int sub_02062DFC (const LocalMapObject * param0) return 1; } -void sub_02062E28 (LocalMapObject * param0, int param1) +void sub_02062E28 (MapObject * param0, int param1) { if (param1 == 1) { - sub_020628BC(param0, (1 << 23)); + MapObject_SetFlagOn(param0, (1 << 23)); } else { - sub_020628C4(param0, (1 << 23)); + MapObject_SetFlagOff(param0, (1 << 23)); } } -int sub_02062E44 (const LocalMapObject * param0) +int sub_02062E44 (const MapObject * param0) { if (sub_020628D0(param0, (1 << 23))) { return 1; @@ -1917,25 +1917,25 @@ int sub_02062E44 (const LocalMapObject * param0) return 0; } -void sub_02062E5C (LocalMapObject * param0, int param1) +void sub_02062E5C (MapObject * param0, int param1) { if (param1 == 1) { - sub_020628BC(param0, (1 << 10)); + MapObject_SetFlagOn(param0, (1 << 10)); } else { - sub_020628C4(param0, (1 << 10)); + MapObject_SetFlagOff(param0, (1 << 10)); } } -void sub_02062E78 (LocalMapObject * param0, int param1) +void sub_02062E78 (MapObject * param0, int param1) { if (param1 == 1) { - sub_020628BC(param0, (1 << 25)); + MapObject_SetFlagOn(param0, (1 << 25)); } else { - sub_020628C4(param0, (1 << 25)); + MapObject_SetFlagOff(param0, (1 << 25)); } } -int sub_02062E94 (const LocalMapObject * param0) +int sub_02062E94 (const MapObject * param0) { if (sub_020628D0(param0, (1 << 25))) { return 1; @@ -1944,16 +1944,16 @@ int sub_02062E94 (const LocalMapObject * param0) return 0; } -void sub_02062EAC (LocalMapObject * param0, int param1) +void sub_02062EAC (MapObject * param0, int param1) { if (param1 == 1) { - sub_020628BC(param0, (1 << 26)); + MapObject_SetFlagOn(param0, (1 << 26)); } else { - sub_020628C4(param0, (1 << 26)); + MapObject_SetFlagOff(param0, (1 << 26)); } } -int sub_02062EC8 (const LocalMapObject * param0) +int sub_02062EC8 (const MapObject * param0) { if (sub_020628D0(param0, (1 << 26))) { return 1; @@ -1962,16 +1962,16 @@ int sub_02062EC8 (const LocalMapObject * param0) return 0; } -void sub_02062EE0 (LocalMapObject * param0, int param1) +void sub_02062EE0 (MapObject * param0, int param1) { if (param1 == 1) { - sub_020628BC(param0, (1 << 27)); + MapObject_SetFlagOn(param0, (1 << 27)); } else { - sub_020628C4(param0, (1 << 27)); + MapObject_SetFlagOff(param0, (1 << 27)); } } -int sub_02062EFC (const LocalMapObject * param0) +int sub_02062EFC (const MapObject * param0) { if (sub_020628D0(param0, (1 << 27))) { return 1; @@ -1980,16 +1980,16 @@ int sub_02062EFC (const LocalMapObject * param0) return 0; } -void sub_02062F14 (LocalMapObject * param0, int param1) +void sub_02062F14 (MapObject * param0, int param1) { if (param1 == 1) { - sub_020628BC(param0, (1 << 28)); + MapObject_SetFlagOn(param0, (1 << 28)); } else { - sub_020628C4(param0, (1 << 28)); + MapObject_SetFlagOff(param0, (1 << 28)); } } -int sub_02062F30 (const LocalMapObject * param0) +int sub_02062F30 (const MapObject * param0) { if (sub_020628D0(param0, (1 << 28))) { return 1; @@ -1998,16 +1998,16 @@ int sub_02062F30 (const LocalMapObject * param0) return 0; } -void sub_02062F48 (LocalMapObject * param0, int param1) +void sub_02062F48 (MapObject * param0, int param1) { if (param1 == 1) { - sub_020628BC(param0, (1 << 24)); + MapObject_SetFlagOn(param0, (1 << 24)); } else { - sub_020628C4(param0, (1 << 24)); + MapObject_SetFlagOff(param0, (1 << 24)); } } -int sub_02062F64 (const LocalMapObject * param0) +int sub_02062F64 (const MapObject * param0) { if (sub_020628D0(param0, (1 << 24))) { return 1; @@ -2016,7 +2016,7 @@ int sub_02062F64 (const LocalMapObject * param0) return 0; } -int sub_02062F7C (const LocalMapObject * param0) +int sub_02062F7C (const MapObject * param0) { if (sub_020628D0(param0, (1 << 4))) { return 1; @@ -2025,16 +2025,16 @@ int sub_02062F7C (const LocalMapObject * param0) return 0; } -void sub_02062F90 (LocalMapObject * param0, int param1) +void sub_02062F90 (MapObject * param0, int param1) { if (param1 == 1) { - sub_020628BC(param0, (1 << 29)); + MapObject_SetFlagOn(param0, (1 << 29)); } else { - sub_020628C4(param0, (1 << 29)); + MapObject_SetFlagOff(param0, (1 << 29)); } } -int sub_02062FAC (const LocalMapObject * param0) +int sub_02062FAC (const MapObject * param0) { if (sub_020628D0(param0, (1 << 29))) { return 1; @@ -2043,7 +2043,7 @@ int sub_02062FAC (const LocalMapObject * param0) return 0; } -void sub_02062FC4 (LocalMapObject * param0, int param1) +void sub_02062FC4 (MapObject * param0, int param1) { if (param1 == 1) { sub_020628F0(param0, (1 << 2)); @@ -2052,7 +2052,7 @@ void sub_02062FC4 (LocalMapObject * param0, int param1) } } -int sub_02062FDC (const LocalMapObject * param0) +int sub_02062FDC (const MapObject * param0) { if (sub_02062904(param0, (1 << 2))) { return 1; @@ -2061,167 +2061,167 @@ int sub_02062FDC (const LocalMapObject * param0) return 0; } -int sub_02062FF0 (const LocalMapObject * param0) +int sub_02062FF0 (const MapObject * param0) { return param0->unk_4C; } -void sub_02062FF4 (LocalMapObject * param0, int param1) +void sub_02062FF4 (MapObject * param0, int param1) { param0->unk_4C = param1; } -int sub_02062FF8 (const LocalMapObject * param0) +int sub_02062FF8 (const MapObject * param0) { return param0->unk_50; } -void sub_02062FFC (LocalMapObject * param0, int param1) +void sub_02062FFC (MapObject * param0, int param1) { param0->unk_50 = param1; } -int sub_02063000 (const LocalMapObject * param0) +int sub_02063000 (const MapObject * param0) { return param0->unk_54; } -void sub_02063004 (LocalMapObject * param0, int param1) +void sub_02063004 (MapObject * param0, int param1) { param0->unk_54 = param1; } -int sub_02063008 (const LocalMapObject * param0) +int sub_02063008 (const MapObject * param0) { return param0->unk_58; } -void sub_0206300C (LocalMapObject * param0, int param1) +void sub_0206300C (MapObject * param0, int param1) { param0->unk_58 = param1; } -int sub_02063010 (const LocalMapObject * param0) +int sub_02063010 (const MapObject * param0) { return param0->unk_5C; } -void sub_02063014 (LocalMapObject * param0, int param1) +void sub_02063014 (MapObject * param0, int param1) { param0->unk_5C = param1; } -int sub_02063018 (const LocalMapObject * param0) +int sub_02063018 (const MapObject * param0) { return param0->unk_60; } -void sub_0206301C (LocalMapObject * param0, int param1) +void sub_0206301C (MapObject * param0, int param1) { param0->unk_60 = param1; } -int sub_02063020 (const LocalMapObject * param0) +int sub_02063020 (const MapObject * param0) { return param0->unk_64; } -void LocalMapObj_SetX (LocalMapObject * param0, int param1) +void LocalMapObj_SetX (MapObject * param0, int param1) { param0->unk_64 = param1; } -void sub_02063028 (LocalMapObject * param0, int param1) +void sub_02063028 (MapObject * param0, int param1) { param0->unk_64 += param1; } -int sub_02063030 (const LocalMapObject * param0) +int sub_02063030 (const MapObject * param0) { return param0->unk_68; } -void sub_02063034 (LocalMapObject * param0, int param1) +void sub_02063034 (MapObject * param0, int param1) { param0->unk_68 = param1; } -void sub_02063038 (LocalMapObject * param0, int param1) +void sub_02063038 (MapObject * param0, int param1) { param0->unk_68 += param1; } -int sub_02063040 (const LocalMapObject * param0) +int sub_02063040 (const MapObject * param0) { return param0->unk_6C; } -void LocalMapObj_SetZ (LocalMapObject * param0, int param1) +void LocalMapObj_SetZ (MapObject * param0, int param1) { param0->unk_6C = param1; } -void sub_02063048 (LocalMapObject * param0, int param1) +void sub_02063048 (MapObject * param0, int param1) { param0->unk_6C += param1; } -void sub_02063050 (const LocalMapObject * param0, VecFx32 * param1) +void sub_02063050 (const MapObject * param0, VecFx32 * param1) { *param1 = param0->unk_70; } -void sub_02063060 (LocalMapObject * param0, const VecFx32 * param1) +void sub_02063060 (MapObject * param0, const VecFx32 * param1) { param0->unk_70 = *param1; } -const VecFx32 * sub_02063070 (const LocalMapObject * param0) +const VecFx32 * sub_02063070 (const MapObject * param0) { return ¶m0->unk_70; } -fx32 sub_02063074 (const LocalMapObject * param0) +fx32 sub_02063074 (const MapObject * param0) { return param0->unk_70.y; } -void sub_02063078 (const LocalMapObject * param0, VecFx32 * param1) +void sub_02063078 (const MapObject * param0, VecFx32 * param1) { *param1 = param0->unk_7C; } -void sub_02063088 (LocalMapObject * param0, const VecFx32 * param1) +void sub_02063088 (MapObject * param0, const VecFx32 * param1) { param0->unk_7C = *param1; } -VecFx32 * sub_02063098 (LocalMapObject * param0) +VecFx32 * sub_02063098 (MapObject * param0) { return ¶m0->unk_7C; } -void sub_0206309C (const LocalMapObject * param0, VecFx32 * param1) +void sub_0206309C (const MapObject * param0, VecFx32 * param1) { *param1 = param0->unk_88; } -void sub_020630AC (LocalMapObject * param0, const VecFx32 * param1) +void sub_020630AC (MapObject * param0, const VecFx32 * param1) { param0->unk_88 = *param1; } -void sub_020630BC (const LocalMapObject * param0, VecFx32 * param1) +void sub_020630BC (const MapObject * param0, VecFx32 * param1) { *param1 = param0->unk_94; } -void sub_020630CC (LocalMapObject * param0, const VecFx32 * param1) +void sub_020630CC (MapObject * param0, const VecFx32 * param1) { param0->unk_94 = *param1; } -int sub_020630DC (const LocalMapObject * param0) +int sub_020630DC (const MapObject * param0) { fx32 v0 = sub_02063074(param0); int v1 = (((v0) >> 3) / FX32_ONE); @@ -2476,10 +2476,10 @@ static const UnkStruct_ov5_021FB0F0 * sub_02063244 (u32 param0) return NULL; } -LocalMapObject * sub_0206326C (const MapObjectManager * param0, int param1, int param2, int param3) +MapObject * sub_0206326C (const MapObjectManager * param0, int param1, int param2, int param3) { int v0; - LocalMapObject * v1; + MapObject * v1; v0 = sub_02062824(param0); v1 = sub_02062878(param0); @@ -2504,7 +2504,7 @@ LocalMapObject * sub_0206326C (const MapObjectManager * param0, int param1, int return NULL; } -void sub_020632D4 (LocalMapObject * param0, const VecFx32 * param1, int param2) +void sub_020632D4 (MapObject * param0, const VecFx32 * param1, int param2) { int v0, v1, v2; @@ -2523,11 +2523,11 @@ void sub_020632D4 (LocalMapObject * param0, const VecFx32 * param1, int param2) sub_0206296C(param0, param2); sub_020656DC(param0); - sub_020628BC(param0, (1 << 2)); - sub_020628C4(param0, (1 << 1) | (1 << 3)); + MapObject_SetFlagOn(param0, (1 << 2)); + MapObject_SetFlagOff(param0, (1 << 1) | (1 << 3)); } -void LocalMapObj_SetPosDir (LocalMapObject * param0, int param1, int param2, int param3, int param4) +void LocalMapObj_SetPosDir (MapObject * param0, int param1, int param2, int param3, int param4) { VecFx32 v0; @@ -2545,13 +2545,13 @@ void LocalMapObj_SetPosDir (LocalMapObject * param0, int param1, int param2, int sub_0206296C(param0, param4); - sub_020628BC(param0, (1 << 2)); - sub_020628C4(param0, (1 << 1) | (1 << 3)); + MapObject_SetFlagOn(param0, (1 << 2)); + MapObject_SetFlagOff(param0, (1 << 1) | (1 << 3)); sub_020656DC(param0); } -void sub_020633A8 (LocalMapObject * param0, u32 param1) +void sub_020633A8 (MapObject * param0, u32 param1) { sub_02062B28(param0); sub_02062944(param0, param1); @@ -2559,7 +2559,7 @@ void sub_020633A8 (LocalMapObject * param0, u32 param1) sub_02063400(param0); } -void sub_020633C8 (LocalMapObject * param0, int param1) +void sub_020633C8 (MapObject * param0, int param1) { LocalMapObj_SetId(param0, param1); @@ -2567,42 +2567,42 @@ void sub_020633C8 (LocalMapObject * param0, int param1) sub_02062618(param0); } -void sub_020633E0 (LocalMapObject * param0) +void sub_020633E0 (MapObject * param0) { return; } -void sub_020633E4 (LocalMapObject * param0) +void sub_020633E4 (MapObject * param0) { return; } -void sub_020633E8 (LocalMapObject * param0) +void sub_020633E8 (MapObject * param0) { return; } -void sub_020633EC (LocalMapObject * param0) +void sub_020633EC (MapObject * param0) { return; } -void sub_020633F0 (LocalMapObject * param0) +void sub_020633F0 (MapObject * param0) { return; } -void sub_020633F4 (LocalMapObject * param0) +void sub_020633F4 (MapObject * param0) { return; } -void sub_020633F8 (LocalMapObject * param0) +void sub_020633F8 (MapObject * param0) { return; } -void sub_020633FC (LocalMapObject * param0) +void sub_020633FC (MapObject * param0) { return; } diff --git a/src/unk_02063400.c b/src/unk_02063400.c index fa6c464e61..2a018cc03f 100644 --- a/src/unk_02063400.c +++ b/src/unk_02063400.c @@ -25,50 +25,50 @@ #include "overlay005/ov5_021F37A8.h" #include "overlay005/ov5_021F3A50.h" -static int sub_02063478(const LocalMapObject * param0); -static void sub_020634DC(LocalMapObject * param0); -static void sub_020634F4(LocalMapObject * param0); -static void sub_02063518(LocalMapObject * param0); -static void sub_0206353C(LocalMapObject * param0); -static void sub_02063574(LocalMapObject * param0); -static void sub_020635AC(LocalMapObject * param0); -static void sub_0206363C(LocalMapObject * param0); -static void sub_020636F0(LocalMapObject * param0); -static void sub_0206375C(LocalMapObject * param0); -static void sub_020637D4(LocalMapObject * param0); -static void sub_02063864(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063964(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_0206397C(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063994(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063A30(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063A64(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063A70(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063A78(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063B20(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063BB4(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063C00(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063C18(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063C30(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063C48(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063C60(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063C94(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063CC8(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063CFC(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063D30(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063DA8(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063DDC(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063E14(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); +static int sub_02063478(const MapObject * param0); +static void sub_020634DC(MapObject * param0); +static void sub_020634F4(MapObject * param0); +static void sub_02063518(MapObject * param0); +static void sub_0206353C(MapObject * param0); +static void sub_02063574(MapObject * param0); +static void sub_020635AC(MapObject * param0); +static void sub_0206363C(MapObject * param0); +static void sub_020636F0(MapObject * param0); +static void sub_0206375C(MapObject * param0); +static void sub_020637D4(MapObject * param0); +static void sub_02063864(MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); +static void sub_02063964(MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); +static void sub_0206397C(MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); +static void sub_02063994(MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); +static void sub_02063A30(MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); +static void sub_02063A64(MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); +static void sub_02063A70(MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); +static void sub_02063A78(MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); +static void sub_02063B20(MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); +static void sub_02063BB4(MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); +static void sub_02063C00(MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); +static void sub_02063C18(MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); +static void sub_02063C30(MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); +static void sub_02063C48(MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); +static void sub_02063C60(MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); +static void sub_02063C94(MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); +static void sub_02063CC8(MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); +static void sub_02063CFC(MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); +static void sub_02063D30(MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); +static void sub_02063DA8(MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); +static void sub_02063DDC(MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); +static void sub_02063E14(MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); static BOOL(*const Unk_020EE76C[4])(u8); static BOOL(*const Unk_020EE77C[4])(u8); -void sub_02063400 (LocalMapObject * param0) +void sub_02063400 (MapObject * param0) { sub_02062B00(param0); sub_020673B8(param0); } -void sub_02063410 (LocalMapObject * param0) +void sub_02063410 (MapObject * param0) { if (sub_02062CBC(param0, (1 << 1))) { return; @@ -92,7 +92,7 @@ void sub_02063410 (LocalMapObject * param0) sub_02063574(param0); } -static int sub_02063478 (const LocalMapObject * param0) +static int sub_02063478 (const MapObject * param0) { if (sub_02062D1C(param0) == 1) { return 1; @@ -119,14 +119,14 @@ static int sub_02063478 (const LocalMapObject * param0) return 1; } -static void sub_020634DC (LocalMapObject * param0) +static void sub_020634DC (MapObject * param0) { if (sub_020628D0(param0, (1 << 12))) { sub_020642F8(param0); } } -static void sub_020634F4 (LocalMapObject * param0) +static void sub_020634F4 (MapObject * param0) { if (sub_020628D0(param0, (1 << 11))) { if (sub_02064390(param0) == 1) { @@ -135,16 +135,16 @@ static void sub_020634F4 (LocalMapObject * param0) } } -static void sub_02063518 (LocalMapObject * param0) +static void sub_02063518 (MapObject * param0) { if (sub_020628D0(param0, (1 << 2))) { sub_020635AC(param0); } - sub_020628C4(param0, (1 << 2) | (1 << 16)); + MapObject_SetFlagOff(param0, (1 << 2) | (1 << 16)); } -static void sub_0206353C (LocalMapObject * param0) +static void sub_0206353C (MapObject * param0) { if (sub_020628D0(param0, (1 << 16))) { sub_020636F0(param0); @@ -152,10 +152,10 @@ static void sub_0206353C (LocalMapObject * param0) sub_0206363C(param0); } - sub_020628C4(param0, (1 << 2) | (1 << 16)); + MapObject_SetFlagOff(param0, (1 << 2) | (1 << 16)); } -static void sub_02063574 (LocalMapObject * param0) +static void sub_02063574 (MapObject * param0) { if (sub_020628D0(param0, (1 << 17))) { sub_020637D4(param0); @@ -163,10 +163,10 @@ static void sub_02063574 (LocalMapObject * param0) sub_0206375C(param0); } - sub_020628C4(param0, (1 << 3) | (1 << 17)); + MapObject_SetFlagOff(param0, (1 << 3) | (1 << 17)); } -static void sub_020635AC (LocalMapObject * param0) +static void sub_020635AC (MapObject * param0) { sub_02064390(param0); @@ -186,7 +186,7 @@ static void sub_020635AC (LocalMapObject * param0) } } -static void sub_0206363C (LocalMapObject * param0) +static void sub_0206363C (MapObject * param0) { sub_02064390(param0); @@ -210,7 +210,7 @@ static void sub_0206363C (LocalMapObject * param0) } } -static void sub_020636F0 (LocalMapObject * param0) +static void sub_020636F0 (MapObject * param0) { sub_02064390(param0); @@ -227,7 +227,7 @@ static void sub_020636F0 (LocalMapObject * param0) } } -static void sub_0206375C (LocalMapObject * param0) +static void sub_0206375C (MapObject * param0) { sub_02064390(param0); @@ -245,7 +245,7 @@ static void sub_0206375C (LocalMapObject * param0) } } -static void sub_020637D4 (LocalMapObject * param0) +static void sub_020637D4 (MapObject * param0) { sub_02064390(param0); @@ -265,7 +265,7 @@ static void sub_020637D4 (LocalMapObject * param0) } } -static void sub_02063864 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063864 (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) { if (sub_02062EFC(param0) == 0) { if ((sub_0205DCF0(param1) == 1) || (sub_0205DD0C(param1) == 1)) { @@ -310,21 +310,21 @@ static void sub_02063864 (LocalMapObject * param0, u8 param1, u8 param2, const U } } -static void sub_02063964 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063964 (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) { if (sub_0205DAC8(param1) == 1) { ov5_021F2EA4(param0, 0); } } -static void sub_0206397C (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_0206397C (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) { if (sub_0205DAC8(param1) == 1) { ov5_021F2EA4(param0, 1); } } -static void sub_02063994 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063994 (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) { if (param3->unk_04_6 == 0) { return; @@ -358,7 +358,7 @@ static void sub_02063994 (LocalMapObject * param0, u8 param1, u8 param2, const U } } -static void sub_02063A30 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063A30 (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) { if (sub_0205DB78(param1) == 1) { if (sub_02062EC8(param0) == 0) { @@ -370,17 +370,17 @@ static void sub_02063A30 (LocalMapObject * param0, u8 param1, u8 param2, const U } } -static void sub_02063A64 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063A64 (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) { sub_02062EAC(param0, 0); } -static void sub_02063A70 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063A70 (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) { sub_02063A78(param0, param1, param2, param3); } -static void sub_02063A78 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063A78 (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) { { const MapObjectManager * v0 = sub_02062A40(param0); @@ -395,16 +395,16 @@ static void sub_02063A78 (LocalMapObject * param0, u8 param1, u8 param2, const U } if ((sub_0205DAC8(param1) == 1) || (sub_0205DAD4(param1) == 1) || (sub_0206406C(param0, param1) == 1) || (sub_0205DE5C(param1) == 1) || (sub_0205DB78(param1) == 1) || (sub_020640D4(param0, param1) == 1) || (sub_0205DCE0(param1) == 1) || (sub_0205DCFC(param1) == 1) || sub_0205DF9C(param1)) { - sub_020628BC(param0, (1 << 20)); + MapObject_SetFlagOn(param0, (1 << 20)); } else { if (sub_020628D0(param0, (1 << 15)) == 0) { ov5_021F1570(param0); - sub_020628BC(param0, (1 << 15)); + MapObject_SetFlagOn(param0, (1 << 15)); } } } -static void sub_02063B20 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063B20 (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) { { const MapObjectManager * v0 = sub_02062A40(param0); @@ -419,13 +419,13 @@ static void sub_02063B20 (LocalMapObject * param0, u8 param1, u8 param2, const U } if ((sub_0205DAC8(param1) == 1) || (sub_0205DAD4(param1) == 1) || (sub_0206406C(param0, param1) == 1) || (sub_0205DE5C(param1) == 1) || (sub_0205DB78(param1) == 1) || (sub_020640D4(param0, param1) == 1) || (sub_0205DCE0(param1) == 1) || (sub_0205DCFC(param1) == 1) || sub_0205DF9C(param1)) { - sub_020628BC(param0, (1 << 20)); + MapObject_SetFlagOn(param0, (1 << 20)); } else { - sub_020628C4(param0, (1 << 20)); + MapObject_SetFlagOff(param0, (1 << 20)); } } -static void sub_02063BB4 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063BB4 (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) { if ((sub_0206406C(param0, param1) == 1) || (sub_0205DB78(param1) == 1) || (sub_0205DC5C(param1) == 1) || (sub_0205DCE0(param1) == 1) || (sub_0205DCFC(param1) == 1) || (sub_020640D4(param0, param1) == 1)) { return; @@ -434,63 +434,63 @@ static void sub_02063BB4 (LocalMapObject * param0, u8 param1, u8 param2, const U ov5_021F3638(param0); } -static void sub_02063C00 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063C00 (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) { if (sub_0205DAD4(param1) == 1) { ov5_021F3844(param0, 0); } } -static void sub_02063C18 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063C18 (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) { if (sub_0205DAD4(param1) == 1) { ov5_021F3844(param0, 1); } } -static void sub_02063C30 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063C30 (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) { if (sub_0205DCFC(param1) == 1) { ov5_021F3AEC(param0, 0); } } -static void sub_02063C48 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063C48 (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) { if (sub_0205DCFC(param1) == 1) { ov5_021F3AEC(param0, 1); } } -static void sub_02063C60 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063C60 (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) { if (sub_0205DE5C(param2) == 1) { ov5_021F2AE4(param0, sub_02063008(param0), sub_02063010(param0), sub_02063018(param0)); } } -static void sub_02063C94 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063C94 (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) { if (sub_0205DE5C(param1) == 1) { ov5_021F2AE4(param0, sub_02063020(param0), sub_02063030(param0), sub_02063040(param0)); } } -static void sub_02063CC8 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063CC8 (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) { if (sub_0205DCE0(param2) == 1) { ov5_021F2C38(param0, sub_02063008(param0), sub_02063010(param0), sub_02063018(param0)); } } -static void sub_02063CFC (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063CFC (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) { if (sub_0205DCE0(param1) == 1) { ov5_021F2C38(param0, sub_02063020(param0), sub_02063030(param0), sub_02063040(param0)); } } -static void sub_02063D30 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063D30 (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) { if (param3->unk_04_10 == 0) { return; @@ -529,7 +529,7 @@ static void sub_02063D30 (LocalMapObject * param0, u8 param1, u8 param2, const U } } -static void sub_02063DA8 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063DA8 (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) { if ((param3->unk_04_10 == 0) || (sub_02062F64(param0) == 0)) { return; @@ -544,7 +544,7 @@ static void sub_02063DA8 (LocalMapObject * param0, u8 param1, u8 param2, const U } } -static void sub_02063DDC (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063DDC (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) { if (sub_0205DEF0(param1) == 1) { sub_02062F14(param0, 1); @@ -555,12 +555,12 @@ static void sub_02063DDC (LocalMapObject * param0, u8 param1, u8 param2, const U } } -static void sub_02063E14 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063E14 (MapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) { return; } -u32 sub_02063E18 (const LocalMapObject * param0, const VecFx32 * param1, int param2, int param3, int param4, int param5) +u32 sub_02063E18 (const MapObject * param0, const VecFx32 * param1, int param2, int param3, int param4, int param5) { u32 v0; @@ -594,7 +594,7 @@ u32 sub_02063E18 (const LocalMapObject * param0, const VecFx32 * param1, int par return v0; } -u32 sub_02063E94 (const LocalMapObject * param0, int param1, int param2, int param3, int param4) +u32 sub_02063E94 (const MapObject * param0, int param1, int param2, int param3, int param4) { VecFx32 v0; @@ -602,7 +602,7 @@ u32 sub_02063E94 (const LocalMapObject * param0, int param1, int param2, int par return sub_02063E18(param0, &v0, param1, param2, param3, param4); } -u32 sub_02063EBC (const LocalMapObject * param0, int param1) +u32 sub_02063EBC (const MapObject * param0, int param1) { int v0, v1, v2; @@ -613,11 +613,11 @@ u32 sub_02063EBC (const LocalMapObject * param0, int param1) return sub_02063E94(param0, v0, v1, v2, param1); } -int sub_02063F00 (const LocalMapObject * param0, int param1, int param2, int param3) +int sub_02063F00 (const MapObject * param0, int param1, int param2, int param3) { int v0, v1, v2; const MapObjectManager * v3; - const LocalMapObject * v4; + const MapObject * v4; v3 = sub_02062A40(param0); v4 = sub_02062868(v3); @@ -669,7 +669,7 @@ int sub_02063F00 (const LocalMapObject * param0, int param1, int param2, int par return 0; } -int sub_02063FAC (const LocalMapObject * param0, int param1, int param2, int param3) +int sub_02063FAC (const MapObject * param0, int param1, int param2, int param3) { int v0, v1, v2, v3; @@ -700,7 +700,7 @@ int sub_02063FAC (const LocalMapObject * param0, int param1, int param2, int par return 0; } -int sub_02064004 (const LocalMapObject * param0, int param1, int param2, int param3) +int sub_02064004 (const MapObject * param0, int param1, int param2, int param3) { if (sub_02062FDC(param0) == 0) { FieldSystem * v0 = sub_02062C00(param0); @@ -733,7 +733,7 @@ static BOOL(*const Unk_020EE77C[4])(u8) = { sub_0205DE14 }; -int sub_0206406C (LocalMapObject * param0, u32 param1) +int sub_0206406C (MapObject * param0, u32 param1) { if (sub_0205DF10(param1)) { if (sub_02062F30(param0) == 0) { @@ -746,7 +746,7 @@ int sub_0206406C (LocalMapObject * param0, u32 param1) return 0; } -int sub_020640A0 (LocalMapObject * param0, u32 param1) +int sub_020640A0 (MapObject * param0, u32 param1) { if (sub_0205DF34(param1)) { if (sub_02062F30(param0) == 0) { @@ -759,7 +759,7 @@ int sub_020640A0 (LocalMapObject * param0, u32 param1) return 0; } -int sub_020640D4 (LocalMapObject * param0, u32 param1) +int sub_020640D4 (MapObject * param0, u32 param1) { if (sub_0205DF58(param1)) { if (sub_02062F30(param0) == 0) { @@ -772,7 +772,7 @@ int sub_020640D4 (LocalMapObject * param0, u32 param1) return 0; } -int sub_02064108 (LocalMapObject * param0, u32 param1) +int sub_02064108 (MapObject * param0, u32 param1) { if (sub_0205DF58(param1)) { if (sub_02062F30(param0) == 0) { @@ -785,7 +785,7 @@ int sub_02064108 (LocalMapObject * param0, u32 param1) return 0; } -int sub_0206413C (LocalMapObject * param0, u32 param1) +int sub_0206413C (MapObject * param0, u32 param1) { if (sub_02062F30(param0) == 1) { if (sub_0205DEFC(param1) == 1) { @@ -796,7 +796,7 @@ int sub_0206413C (LocalMapObject * param0, u32 param1) return 0; } -int sub_0206415C (LocalMapObject * param0, u32 param1) +int sub_0206415C (MapObject * param0, u32 param1) { if (sub_02062F30(param0) == 1) { if (sub_0205DF64(param1) == 1) { @@ -807,7 +807,7 @@ int sub_0206415C (LocalMapObject * param0, u32 param1) return 0; } -int sub_0206417C (LocalMapObject * param0, u32 param1) +int sub_0206417C (MapObject * param0, u32 param1) { if (sub_02062F30(param0) == 1) { if (sub_0205DF78(param1) == 1) { @@ -849,7 +849,7 @@ int sub_020641A8 (int param0) return Unk_020EE78C[param0]; } -void sub_020641B4 (LocalMapObject * param0, int param1) +void sub_020641B4 (MapObject * param0, int param1) { sub_0206300C(param0, sub_02063020(param0)); sub_02063014(param0, sub_02063030(param0)); @@ -860,14 +860,14 @@ void sub_020641B4 (LocalMapObject * param0, int param1) sub_02063048(param0, sub_020641A8(param1)); } -void sub_02064208 (LocalMapObject * param0) +void sub_02064208 (MapObject * param0) { sub_0206300C(param0, sub_02063020(param0)); sub_02063014(param0, sub_02063030(param0)); sub_0206301C(param0, sub_02063040(param0)); } -u32 sub_02064238 (LocalMapObject * param0, int param1) +u32 sub_02064238 (MapObject * param0, int param1) { int v0 = sub_02063020(param0) + sub_0206419C(param1); int v1 = sub_02063040(param0) + sub_020641A8(param1); @@ -877,7 +877,7 @@ u32 sub_02064238 (LocalMapObject * param0, int param1) return v3; } -void sub_02064270 (LocalMapObject * param0, const VecFx32 * param1) +void sub_02064270 (MapObject * param0, const VecFx32 * param1) { VecFx32 v0; @@ -890,7 +890,7 @@ void sub_02064270 (LocalMapObject * param0, const VecFx32 * param1) sub_02063060(param0, &v0); } -void sub_020642A4 (LocalMapObject * param0, int param1, fx32 param2) +void sub_020642A4 (MapObject * param0, int param1, fx32 param2) { VecFx32 v0; @@ -914,7 +914,7 @@ void sub_020642A4 (LocalMapObject * param0, int param1, fx32 param2) sub_02063060(param0, &v0); } -int sub_020642F8 (LocalMapObject * param0) +int sub_020642F8 (MapObject * param0) { VecFx32 v0, v1; @@ -922,7 +922,7 @@ int sub_020642F8 (LocalMapObject * param0) v1 = v0; if (sub_02062E44(param0) == 1) { - sub_020628C4(param0, (1 << 12)); + MapObject_SetFlagOff(param0, (1 << 12)); return 0; } @@ -936,16 +936,16 @@ int sub_020642F8 (LocalMapObject * param0) sub_02063060(param0, &v0); sub_02063014(param0, sub_02063030(param0)); sub_02063034(param0, (((v0.y) >> 3) / FX32_ONE)); - sub_020628C4(param0, (1 << 12)); + MapObject_SetFlagOff(param0, (1 << 12)); } else { - sub_020628BC(param0, (1 << 12)); + MapObject_SetFlagOn(param0, (1 << 12)); } return v4; } } -int sub_02064390 (LocalMapObject * param0) +int sub_02064390 (MapObject * param0) { u8 v0 = sub_0205DF98(); u8 v1 = v0; @@ -965,11 +965,11 @@ int sub_02064390 (LocalMapObject * param0) sub_02062BE0(param0, v1); if (sub_0205DF8C(v1) == 1) { - sub_020628BC(param0, (1 << 11)); + MapObject_SetFlagOn(param0, (1 << 11)); return 0; } - sub_020628C4(param0, (1 << 11)); + MapObject_SetFlagOff(param0, (1 << 11)); return 1; } @@ -997,7 +997,7 @@ void sub_02064450 (int param0, int param1, VecFx32 * param2) param2->z = (((param1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); } -void sub_02064464 (LocalMapObject * param0) +void sub_02064464 (MapObject * param0) { int v0 = sub_02062948(param0); diff --git a/src/unk_0206450C.c b/src/unk_0206450C.c index dd8bb65040..b704d0ee6a 100644 --- a/src/unk_0206450C.c +++ b/src/unk_0206450C.c @@ -88,30 +88,30 @@ typedef struct { UnkStruct_02065550 unk_08; } UnkStruct_0206502C; -static void sub_0206450C(LocalMapObject * param0, int param1); -static void sub_02064668(LocalMapObject * param0, int param1, int param2, int param3); +static void sub_0206450C(MapObject * param0, int param1); +static void sub_02064668(MapObject * param0, int param1, int param2, int param3); static int sub_020652EC(const int * param0, int param1); static int sub_0206530C(const int * param0, int param1); static int sub_02065330(int param0, int param1); static const int * sub_02065358(int param0); -static int sub_0206537C(LocalMapObject * param0); -static int sub_02065448(LocalMapObject * param0, int param1, int param2); -static void sub_020647A0(LocalMapObject * param0, UnkStruct_020647A0 * param1); -static int sub_0206489C(LocalMapObject * param0, int param1); -static void sub_020648F4(LocalMapObject * param0, int param1); -static void sub_0206496C(LocalMapObject * param0, int param1); -static void sub_02064D98(LocalMapObject * param0, int param1, int param2, int param3); -static void sub_0206502C(LocalMapObject * param0, int param1, int param2, int param3); -static int sub_0206553C(LocalMapObject * param0); -static void sub_02065550(LocalMapObject * param0, UnkStruct_02065550 * param1); -static void sub_02065568(LocalMapObject * param0, UnkStruct_02065550 * param1); -static void sub_020655E4(LocalMapObject * param0, UnkStruct_02065550 * param1); +static int sub_0206537C(MapObject * param0); +static int sub_02065448(MapObject * param0, int param1, int param2); +static void sub_020647A0(MapObject * param0, UnkStruct_020647A0 * param1); +static int sub_0206489C(MapObject * param0, int param1); +static void sub_020648F4(MapObject * param0, int param1); +static void sub_0206496C(MapObject * param0, int param1); +static void sub_02064D98(MapObject * param0, int param1, int param2, int param3); +static void sub_0206502C(MapObject * param0, int param1, int param2, int param3); +static int sub_0206553C(MapObject * param0); +static void sub_02065550(MapObject * param0, UnkStruct_02065550 * param1); +static void sub_02065568(MapObject * param0, UnkStruct_02065550 * param1); +static void sub_020655E4(MapObject * param0, UnkStruct_02065550 * param1); -int(*const Unk_020EE900[])(LocalMapObject *, UnkStruct_0206496C *); -int(*const Unk_020EE870[])(LocalMapObject *, UnkStruct_0206496C *); -int(*const Unk_020EE814[])(LocalMapObject *, UnkStruct_02064C28 *); -int(*const Unk_020EE7AC[])(LocalMapObject *, UnkStruct_02064D98 *); -int(*const Unk_020EE820[])(LocalMapObject *, UnkStruct_0206502C *); +int(*const Unk_020EE900[])(MapObject *, UnkStruct_0206496C *); +int(*const Unk_020EE870[])(MapObject *, UnkStruct_0206496C *); +int(*const Unk_020EE814[])(MapObject *, UnkStruct_02064C28 *); +int(*const Unk_020EE7AC[])(MapObject *, UnkStruct_02064D98 *); +int(*const Unk_020EE820[])(MapObject *, UnkStruct_0206502C *); static const int Unk_020EEAB0[2][4]; const int Unk_020EEA88[]; const int Unk_020EEA9C[]; @@ -155,7 +155,7 @@ const int Unk_020EE9D0[]; static const UnkStruct_020EEB08 Unk_020EEB08[40]; const int Unk_020EEAD0[]; -static void sub_0206450C (LocalMapObject * param0, int param1) +static void sub_0206450C (MapObject * param0, int param1) { UnkStruct_0206450C * v0; @@ -167,62 +167,62 @@ static void sub_0206450C (LocalMapObject * param0, int param1) sub_02062D10(param0); } -void sub_0206453C (LocalMapObject * param0) +void sub_0206453C (MapObject * param0) { sub_0206450C(param0, 0); } -void sub_02064548 (LocalMapObject * param0) +void sub_02064548 (MapObject * param0) { sub_0206450C(param0, 1); } -void sub_02064554 (LocalMapObject * param0) +void sub_02064554 (MapObject * param0) { sub_0206450C(param0, 2); } -void sub_02064560 (LocalMapObject * param0) +void sub_02064560 (MapObject * param0) { sub_0206450C(param0, 3); } -void sub_0206456C (LocalMapObject * param0) +void sub_0206456C (MapObject * param0) { sub_0206450C(param0, 4); } -void sub_02064578 (LocalMapObject * param0) +void sub_02064578 (MapObject * param0) { sub_0206450C(param0, 5); } -void sub_02064584 (LocalMapObject * param0) +void sub_02064584 (MapObject * param0) { sub_0206450C(param0, 6); } -void sub_02064590 (LocalMapObject * param0) +void sub_02064590 (MapObject * param0) { sub_0206450C(param0, 7); } -void sub_0206459C (LocalMapObject * param0) +void sub_0206459C (MapObject * param0) { sub_0206450C(param0, 8); } -void sub_020645A8 (LocalMapObject * param0) +void sub_020645A8 (MapObject * param0) { sub_0206450C(param0, 9); } -void sub_020645B4 (LocalMapObject * param0) +void sub_020645B4 (MapObject * param0) { sub_0206450C(param0, 10); } -void sub_020645C0 (LocalMapObject * param0) +void sub_020645C0 (MapObject * param0) { UnkStruct_0206450C * v0 = sub_02062A78(param0); int v1 = sub_02065448(param0, v0->unk_04, -1); @@ -244,32 +244,32 @@ void sub_020645C0 (LocalMapObject * param0) sub_02064208(param0); } -void sub_02064624 (LocalMapObject * param0) +void sub_02064624 (MapObject * param0) { return; } -void sub_02064628 (LocalMapObject * param0) +void sub_02064628 (MapObject * param0) { sub_02064668(param0, 0xc, 11, 0); } -void sub_02064638 (LocalMapObject * param0) +void sub_02064638 (MapObject * param0) { sub_02064668(param0, 0xc, 12, 0); } -void sub_02064648 (LocalMapObject * param0) +void sub_02064648 (MapObject * param0) { sub_02064668(param0, 0xc, 13, 0); } -void sub_02064658 (LocalMapObject * param0) +void sub_02064658 (MapObject * param0) { sub_02064668(param0, 0xc, 13, 2); } -static void sub_02064668 (LocalMapObject * param0, int param1, int param2, int param3) +static void sub_02064668 (MapObject * param0, int param1, int param2, int param3) { UnkStruct_02064668 * v0; @@ -283,7 +283,7 @@ static void sub_02064668 (LocalMapObject * param0, int param1, int param2, int p sub_02062D10(param0); } -void sub_02064690 (LocalMapObject * param0) +void sub_02064690 (MapObject * param0) { int v0; UnkStruct_02064668 * v1; @@ -360,7 +360,7 @@ void sub_02064690 (LocalMapObject * param0) } } -static void sub_020647A0 (LocalMapObject * param0, UnkStruct_020647A0 * param1) +static void sub_020647A0 (MapObject * param0, UnkStruct_020647A0 * param1) { int v0, v1, v2, v3, v4; @@ -408,7 +408,7 @@ static void sub_020647A0 (LocalMapObject * param0, UnkStruct_020647A0 * param1) } } -static int sub_0206489C (LocalMapObject * param0, int param1) +static int sub_0206489C (MapObject * param0, int param1) { int v0, v1; UnkStruct_020647A0 v2; @@ -429,7 +429,7 @@ static int sub_0206489C (LocalMapObject * param0, int param1) return 1; } -static void sub_020648F4 (LocalMapObject * param0, int param1) +static void sub_020648F4 (MapObject * param0, int param1) { UnkStruct_020648F4 * v0; @@ -441,7 +441,7 @@ static void sub_020648F4 (LocalMapObject * param0, int param1) sub_02064208(param0); } -void sub_02064918 (LocalMapObject * param0) +void sub_02064918 (MapObject * param0) { UnkStruct_020648F4 * v0; @@ -457,27 +457,27 @@ void sub_02064918 (LocalMapObject * param0) } } -void sub_0206493C (LocalMapObject * param0) +void sub_0206493C (MapObject * param0) { sub_020648F4(param0, 0); } -void sub_02064948 (LocalMapObject * param0) +void sub_02064948 (MapObject * param0) { sub_020648F4(param0, 1); } -void sub_02064954 (LocalMapObject * param0) +void sub_02064954 (MapObject * param0) { sub_020648F4(param0, 2); } -void sub_02064960 (LocalMapObject * param0) +void sub_02064960 (MapObject * param0) { sub_020648F4(param0, 3); } -static void sub_0206496C (LocalMapObject * param0, int param1) +static void sub_0206496C (MapObject * param0, int param1) { UnkStruct_0206496C * v0; @@ -489,17 +489,17 @@ static void sub_0206496C (LocalMapObject * param0, int param1) sub_02064208(param0); } -void sub_02064990 (LocalMapObject * param0) +void sub_02064990 (MapObject * param0) { sub_0206496C(param0, 2); } -void sub_0206499C (LocalMapObject * param0) +void sub_0206499C (MapObject * param0) { sub_0206496C(param0, 3); } -void sub_020649A8 (LocalMapObject * param0) +void sub_020649A8 (MapObject * param0) { UnkStruct_0206496C * v0; @@ -510,7 +510,7 @@ void sub_020649A8 (LocalMapObject * param0) } } -static int sub_020649CC (LocalMapObject * param0, UnkStruct_0206496C * param1) +static int sub_020649CC (MapObject * param0, UnkStruct_0206496C * param1) { int v0 = sub_02065448(param0, 38, -1); @@ -525,7 +525,7 @@ static int sub_020649CC (LocalMapObject * param0, UnkStruct_0206496C * param1) return 1; } -static int sub_02064A00 (LocalMapObject * param0, UnkStruct_0206496C * param1) +static int sub_02064A00 (MapObject * param0, UnkStruct_0206496C * param1) { if (sub_020658DC(param0) == 0) { return 0; @@ -537,7 +537,7 @@ static int sub_02064A00 (LocalMapObject * param0, UnkStruct_0206496C * param1) return 1; } -static int sub_02064A1C (LocalMapObject * param0, UnkStruct_0206496C * param1) +static int sub_02064A1C (MapObject * param0, UnkStruct_0206496C * param1) { if (param1->unk_04) { if (sub_02065448(param0, 38, -1) != -1) { @@ -556,7 +556,7 @@ static int sub_02064A1C (LocalMapObject * param0, UnkStruct_0206496C * param1) return 1; } -static int sub_02064A58 (LocalMapObject * param0, UnkStruct_0206496C * param1) +static int sub_02064A58 (MapObject * param0, UnkStruct_0206496C * param1) { int v0, v1, * v2; int v3[5] = {0, 2, 1, 3, -1}; @@ -592,19 +592,19 @@ static int sub_02064A58 (LocalMapObject * param0, UnkStruct_0206496C * param1) return 1; } -static int(*const Unk_020EE900[])(LocalMapObject *, UnkStruct_0206496C *) = { +static int(*const Unk_020EE900[])(MapObject *, UnkStruct_0206496C *) = { sub_020649CC, sub_02064A00, sub_02064A1C, sub_02064A58 }; -void sub_02064AF0 (LocalMapObject * param0) +void sub_02064AF0 (MapObject * param0) { sub_0206496C(param0, 3); } -void sub_02064AFC (LocalMapObject * param0) +void sub_02064AFC (MapObject * param0) { UnkStruct_0206496C * v0; @@ -615,7 +615,7 @@ void sub_02064AFC (LocalMapObject * param0) } } -static int sub_02064B20 (LocalMapObject * param0, UnkStruct_0206496C * param1) +static int sub_02064B20 (MapObject * param0, UnkStruct_0206496C * param1) { int v0 = sub_0206298C(param0); @@ -626,7 +626,7 @@ static int sub_02064B20 (LocalMapObject * param0, UnkStruct_0206496C * param1) return 1; } -static int sub_02064B40 (LocalMapObject * param0, UnkStruct_0206496C * param1) +static int sub_02064B40 (MapObject * param0, UnkStruct_0206496C * param1) { if (sub_020658DC(param0) == 0) { return 0; @@ -638,7 +638,7 @@ static int sub_02064B40 (LocalMapObject * param0, UnkStruct_0206496C * param1) return 1; } -static int sub_02064B5C (LocalMapObject * param0, UnkStruct_0206496C * param1) +static int sub_02064B5C (MapObject * param0, UnkStruct_0206496C * param1) { param1->unk_04++; @@ -650,7 +650,7 @@ static int sub_02064B5C (LocalMapObject * param0, UnkStruct_0206496C * param1) return 1; } -static int sub_02064B74 (LocalMapObject * param0, UnkStruct_0206496C * param1) +static int sub_02064B74 (MapObject * param0, UnkStruct_0206496C * param1) { int v0, v1, * v2; int v3[5] = {0, 2, 1, 3, -1}; @@ -695,14 +695,14 @@ static int sub_02064B74 (LocalMapObject * param0, UnkStruct_0206496C * param1) return 1; } -static int(*const Unk_020EE870[])(LocalMapObject *, UnkStruct_0206496C *) = { +static int(*const Unk_020EE870[])(MapObject *, UnkStruct_0206496C *) = { sub_02064B20, sub_02064B40, sub_02064B5C, sub_02064B74 }; -void sub_02064C28 (LocalMapObject * param0) +void sub_02064C28 (MapObject * param0) { UnkStruct_02064C28 * v0; @@ -713,7 +713,7 @@ void sub_02064C28 (LocalMapObject * param0) } } -void sub_02064C48 (LocalMapObject * param0) +void sub_02064C48 (MapObject * param0) { UnkStruct_02064C28 * v0 = sub_02062A78(param0); @@ -722,7 +722,7 @@ void sub_02064C48 (LocalMapObject * param0) } } -static int sub_02064C6C (LocalMapObject * param0, UnkStruct_02064C28 * param1) +static int sub_02064C6C (MapObject * param0, UnkStruct_02064C28 * param1) { int v0; @@ -742,7 +742,7 @@ static int sub_02064C6C (LocalMapObject * param0, UnkStruct_02064C28 * param1) return 1; } -static int sub_02064CA8 (LocalMapObject * param0, UnkStruct_02064C28 * param1) +static int sub_02064CA8 (MapObject * param0, UnkStruct_02064C28 * param1) { if (param1->unk_02) { int v0, v1, v2, v3; @@ -798,7 +798,7 @@ static int sub_02064CA8 (LocalMapObject * param0, UnkStruct_02064C28 * param1) return 1; } -static int sub_02064D68 (LocalMapObject * param0, UnkStruct_02064C28 * param1) +static int sub_02064D68 (MapObject * param0, UnkStruct_02064C28 * param1) { if (sub_020658DC(param0) == 1) { sub_02062D10(param0); @@ -813,13 +813,13 @@ static int sub_02064D68 (LocalMapObject * param0, UnkStruct_02064C28 * param1) return 0; } -static int(*const Unk_020EE814[])(LocalMapObject *, UnkStruct_02064C28 *) = { +static int(*const Unk_020EE814[])(MapObject *, UnkStruct_02064C28 *) = { sub_02064C6C, sub_02064CA8, sub_02064D68 }; -static void sub_02064D98 (LocalMapObject * param0, int param1, int param2, int param3) +static void sub_02064D98 (MapObject * param0, int param1, int param2, int param3) { UnkStruct_02064D98 * v0; @@ -833,87 +833,87 @@ static void sub_02064D98 (LocalMapObject * param0, int param1, int param2, int p } } -void sub_02064DC8 (LocalMapObject * param0) +void sub_02064DC8 (MapObject * param0) { sub_02064D98(param0, 2, 0, 14); } -void sub_02064DD8 (LocalMapObject * param0) +void sub_02064DD8 (MapObject * param0) { sub_02064D98(param0, 2, 0, 15); } -void sub_02064DE8 (LocalMapObject * param0) +void sub_02064DE8 (MapObject * param0) { sub_02064D98(param0, 2, 1, 16); } -void sub_02064DF8 (LocalMapObject * param0) +void sub_02064DF8 (MapObject * param0) { sub_02064D98(param0, 2, 1, 17); } -void sub_02064E08 (LocalMapObject * param0) +void sub_02064E08 (MapObject * param0) { sub_02064D98(param0, 2, 0, 18); } -void sub_02064E18 (LocalMapObject * param0) +void sub_02064E18 (MapObject * param0) { sub_02064D98(param0, 2, 0, 19); } -void sub_02064E28 (LocalMapObject * param0) +void sub_02064E28 (MapObject * param0) { sub_02064D98(param0, 2, 1, 20); } -void sub_02064E38 (LocalMapObject * param0) +void sub_02064E38 (MapObject * param0) { sub_02064D98(param0, 2, 1, 21); } -void sub_02064E48 (LocalMapObject * param0) +void sub_02064E48 (MapObject * param0) { sub_02064D98(param0, 2, 1, 22); } -void sub_02064E58 (LocalMapObject * param0) +void sub_02064E58 (MapObject * param0) { sub_02064D98(param0, 2, 1, 23); } -void sub_02064E68 (LocalMapObject * param0) +void sub_02064E68 (MapObject * param0) { sub_02064D98(param0, 2, 0, 24); } -void sub_02064E78 (LocalMapObject * param0) +void sub_02064E78 (MapObject * param0) { sub_02064D98(param0, 2, 0, 25); } -void sub_02064E88 (LocalMapObject * param0) +void sub_02064E88 (MapObject * param0) { sub_02064D98(param0, 2, 1, 26); } -void sub_02064E98 (LocalMapObject * param0) +void sub_02064E98 (MapObject * param0) { sub_02064D98(param0, 2, 1, 27); } -void sub_02064EA8 (LocalMapObject * param0) +void sub_02064EA8 (MapObject * param0) { sub_02064D98(param0, 2, 0, 28); } -void sub_02064EB8 (LocalMapObject * param0) +void sub_02064EB8 (MapObject * param0) { sub_02064D98(param0, 2, 0, 29); } -void sub_02064EC8 (LocalMapObject * param0) +void sub_02064EC8 (MapObject * param0) { UnkStruct_02064D98 * v0; @@ -924,7 +924,7 @@ void sub_02064EC8 (LocalMapObject * param0) } } -static int sub_02064EEC (LocalMapObject * param0, UnkStruct_02064D98 * param1) +static int sub_02064EEC (MapObject * param0, UnkStruct_02064D98 * param1) { if (param1->unk_01 == param1->unk_02) { if (param1->unk_03 == 0) { @@ -1004,7 +1004,7 @@ static int sub_02064EEC (LocalMapObject * param0, UnkStruct_02064D98 * param1) return 1; } -static int sub_02064FFC (LocalMapObject * param0, UnkStruct_02064D98 * param1) +static int sub_02064FFC (MapObject * param0, UnkStruct_02064D98 * param1) { if (sub_020658DC(param0) == 1) { sub_02062D10(param0); @@ -1019,12 +1019,12 @@ static int sub_02064FFC (LocalMapObject * param0, UnkStruct_02064D98 * param1) return 0; } -static int(*const Unk_020EE7AC[])(LocalMapObject *, UnkStruct_02064D98 *) = { +static int(*const Unk_020EE7AC[])(MapObject *, UnkStruct_02064D98 *) = { sub_02064EEC, sub_02064FFC }; -static void sub_0206502C (LocalMapObject * param0, int param1, int param2, int param3) +static void sub_0206502C (MapObject * param0, int param1, int param2, int param3) { UnkStruct_0206502C * v0; @@ -1039,47 +1039,47 @@ static void sub_0206502C (LocalMapObject * param0, int param1, int param2, int p } } -void sub_0206505C (LocalMapObject * param0) +void sub_0206505C (MapObject * param0) { sub_0206502C(param0, 2, 1, 30); } -void sub_0206506C (LocalMapObject * param0) +void sub_0206506C (MapObject * param0) { sub_0206502C(param0, 2, 1, 31); } -void sub_0206507C (LocalMapObject * param0) +void sub_0206507C (MapObject * param0) { sub_0206502C(param0, 2, 0, 32); } -void sub_0206508C (LocalMapObject * param0) +void sub_0206508C (MapObject * param0) { sub_0206502C(param0, 2, 0, 33); } -void sub_0206509C (LocalMapObject * param0) +void sub_0206509C (MapObject * param0) { sub_0206502C(param0, 2, 1, 34); } -void sub_020650AC (LocalMapObject * param0) +void sub_020650AC (MapObject * param0) { sub_0206502C(param0, 2, 1, 35); } -void sub_020650BC (LocalMapObject * param0) +void sub_020650BC (MapObject * param0) { sub_0206502C(param0, 2, 0, 36); } -void sub_020650CC (LocalMapObject * param0) +void sub_020650CC (MapObject * param0) { sub_0206502C(param0, 2, 0, 37); } -void sub_020650DC (LocalMapObject * param0) +void sub_020650DC (MapObject * param0) { UnkStruct_0206502C * v0 = sub_02062A78(param0); @@ -1101,7 +1101,7 @@ static void sub_02065100 (UnkStruct_0206502C * param0) } } -static int sub_02065124 (LocalMapObject * param0, UnkStruct_0206502C * param1) +static int sub_02065124 (MapObject * param0, UnkStruct_0206502C * param1) { if (sub_02062950(param0) == 0xa) { FieldSystem * v0 = sub_02062C00(param0); @@ -1125,7 +1125,7 @@ static int sub_02065124 (LocalMapObject * param0, UnkStruct_0206502C * param1) return 1; } -static int sub_02065188 (LocalMapObject * param0, UnkStruct_0206502C * param1) +static int sub_02065188 (MapObject * param0, UnkStruct_0206502C * param1) { if (sub_020658DC(param0) == 1) { sub_02062D10(param0); @@ -1135,7 +1135,7 @@ static int sub_02065188 (LocalMapObject * param0, UnkStruct_0206502C * param1) return 0; } -static int sub_020651A4 (LocalMapObject * param0, UnkStruct_0206502C * param1) +static int sub_020651A4 (MapObject * param0, UnkStruct_0206502C * param1) { if (param1->unk_01 == param1->unk_02) { if (param1->unk_03 == 0) { @@ -1215,7 +1215,7 @@ static int sub_020651A4 (LocalMapObject * param0, UnkStruct_0206502C * param1) return 1; } -static int sub_020652BC (LocalMapObject * param0, UnkStruct_0206502C * param1) +static int sub_020652BC (MapObject * param0, UnkStruct_0206502C * param1) { if (sub_020658DC(param0) == 1) { sub_02062D10(param0); @@ -1230,7 +1230,7 @@ static int sub_020652BC (LocalMapObject * param0, UnkStruct_0206502C * param1) return 0; } -static int(*const Unk_020EE820[])(LocalMapObject *, UnkStruct_0206502C *) = { +static int(*const Unk_020EE820[])(MapObject *, UnkStruct_0206502C *) = { sub_02065124, sub_02065188, sub_020651A4, @@ -1275,7 +1275,7 @@ static const int * sub_02065358 (int param0) return NULL; } -static int sub_0206537C (LocalMapObject * param0) +static int sub_0206537C (MapObject * param0) { int v0 = sub_02062950(param0); @@ -1310,7 +1310,7 @@ static int sub_0206537C (LocalMapObject * param0) } { - const LocalMapObject * v5 = Player_LocalMapObject(v2); + const MapObject * v5 = Player_MapObject(v2); int v6 = sub_020630DC(v5); int v7 = sub_020630DC(param0); @@ -1341,7 +1341,7 @@ static int sub_0206537C (LocalMapObject * param0) return(-1); } -static int sub_02065448 (LocalMapObject * param0, int param1, int param2) +static int sub_02065448 (MapObject * param0, int param1, int param2) { const int * v0 = sub_02065358(param1); int v1 = sub_020652EC(v0, param2); @@ -1434,7 +1434,7 @@ static const int Unk_020EEAB0[2][4] = { {0x0, 0x3, 0x1, 0x2} }; -static int sub_0206553C (LocalMapObject * param0) +static int sub_0206553C (MapObject * param0) { int v0 = sub_02062950(param0); @@ -1445,7 +1445,7 @@ static int sub_0206553C (LocalMapObject * param0) return 0; } -static void sub_02065550 (LocalMapObject * param0, UnkStruct_02065550 * param1) +static void sub_02065550 (MapObject * param0, UnkStruct_02065550 * param1) { if (sub_02062950(param0) == 0x7) { param1->unk_01 = 0; @@ -1454,7 +1454,7 @@ static void sub_02065550 (LocalMapObject * param0, UnkStruct_02065550 * param1) } } -static void sub_02065568 (LocalMapObject * param0, UnkStruct_02065550 * param1) +static void sub_02065568 (MapObject * param0, UnkStruct_02065550 * param1) { int v0, v1 = sub_0206298C(param0); @@ -1476,13 +1476,13 @@ static void sub_02065568 (LocalMapObject * param0, UnkStruct_02065550 * param1) } sub_02062974(param0, v1); - sub_020628BC(param0, (1 << 7)); + MapObject_SetFlagOn(param0, (1 << 7)); } -static void sub_020655E4 (LocalMapObject * param0, UnkStruct_02065550 * param1) +static void sub_020655E4 (MapObject * param0, UnkStruct_02065550 * param1) { if (param1->unk_02 == 0) { - sub_020628C4(param0, (1 << 7)); + MapObject_SetFlagOff(param0, (1 << 7)); } } diff --git a/src/unk_020655F4.c b/src/unk_020655F4.c index 2c8b54f2c1..9ac2a54a72 100644 --- a/src/unk_020655F4.c +++ b/src/unk_020655F4.c @@ -27,7 +27,7 @@ typedef struct { int unk_00; int unk_04; int unk_08; - LocalMapObject * unk_0C; + MapObject * unk_0C; const UnkStruct_ov5_021F8E3C * unk_10; } UnkStruct_020EEE54; @@ -104,15 +104,15 @@ typedef struct { } UnkStruct_020667CC; static void sub_02065788(SysTask * param0, void * param1); -static int sub_02065910(LocalMapObject * param0, int param1, int param2); -static int sub_02065924(LocalMapObject * param0); -static void sub_02065930(LocalMapObject * param0, int param1); -static void sub_02065980(LocalMapObject * param0, int param1, fx32 param2, s16 param3, u16 param4); -static int sub_020659C8(LocalMapObject * param0); -static void sub_02065C64(LocalMapObject * param0, int param1, s16 param2, u16 param3); -static int sub_02065C98(LocalMapObject * param0); -static void sub_020664A0(LocalMapObject * param0, int param1, int param2); -static int sub_020664C8(LocalMapObject * param0); +static int sub_02065910(MapObject * param0, int param1, int param2); +static int sub_02065924(MapObject * param0); +static void sub_02065930(MapObject * param0, int param1); +static void sub_02065980(MapObject * param0, int param1, fx32 param2, s16 param3, u16 param4); +static int sub_020659C8(MapObject * param0); +static void sub_02065C64(MapObject * param0, int param1, s16 param2, u16 param3); +static int sub_02065C98(MapObject * param0); +static void sub_020664A0(MapObject * param0, int param1, int param2); +static int sub_020664C8(MapObject * param0); int(*const Unk_020EEE54[])(UnkStruct_020EEE54 *); const fx32 * Unk_02100B84[]; @@ -120,7 +120,7 @@ static const fx32 Unk_020EEE84[7]; static const fx32 Unk_020EEE6C[6]; static const fx32 Unk_020EECEC[3]; -int LocalMapObj_IsAnimationSet (const LocalMapObject * param0) +int LocalMapObj_IsAnimationSet (const MapObject * param0) { if (sub_020628D8(param0, (1 << 0)) == 0) { return 0; @@ -137,24 +137,24 @@ int LocalMapObj_IsAnimationSet (const LocalMapObject * param0) return 1; } -void LocalMapObj_SetAnimationCode (LocalMapObject * param0, int param1) +void LocalMapObj_SetAnimationCode (MapObject * param0, int param1) { GF_ASSERT(param1 < 0x9a); sub_02062BB0(param0, param1); sub_02062BC0(param0, 0); - sub_020628BC(param0, (1 << 4)); - sub_020628C4(param0, (1 << 5)); + MapObject_SetFlagOn(param0, (1 << 4)); + MapObject_SetFlagOff(param0, (1 << 5)); } -void sub_02065668 (LocalMapObject * param0, int param1) +void sub_02065668 (MapObject * param0, int param1) { sub_02062BB0(param0, param1); sub_02062BC0(param0, 0); - sub_020628C4(param0, (1 << 5)); + MapObject_SetFlagOff(param0, (1 << 5)); } -int LocalMapObj_CheckAnimationFinished (const LocalMapObject * param0) +int LocalMapObj_CheckAnimationFinished (const MapObject * param0) { if (sub_020628D8(param0, (1 << 4)) == 0) { return 1; @@ -167,7 +167,7 @@ int LocalMapObj_CheckAnimationFinished (const LocalMapObject * param0) return 1; } -int sub_020656AC (LocalMapObject * param0) +int sub_020656AC (MapObject * param0) { if (sub_020628D8(param0, (1 << 4)) == 0) { return 1; @@ -177,20 +177,20 @@ int sub_020656AC (LocalMapObject * param0) return 0; } - sub_020628C4(param0, (1 << 4) | (1 << 5)); + MapObject_SetFlagOff(param0, (1 << 4) | (1 << 5)); return 1; } -void sub_020656DC (LocalMapObject * param0) +void sub_020656DC (MapObject * param0) { - sub_020628C4(param0, (1 << 4)); - sub_020628BC(param0, (1 << 5)); + MapObject_SetFlagOff(param0, (1 << 4)); + MapObject_SetFlagOn(param0, (1 << 5)); sub_02062BB0(param0, 0xff); sub_02062BC0(param0, 0); } -SysTask * sub_02065700 (LocalMapObject * param0, const UnkStruct_ov5_021F8E3C * param1) +SysTask * sub_02065700 (MapObject * param0, const UnkStruct_ov5_021F8E3C * param1) { SysTask * v0; UnkStruct_020EEE54 * v1; @@ -382,7 +382,7 @@ int sub_0206587C (int param0) return(-1); } -void sub_020658B4 (LocalMapObject * param0) +void sub_020658B4 (MapObject * param0) { int v0, v1; @@ -397,7 +397,7 @@ void sub_020658B4 (LocalMapObject * param0) } while (sub_02065910(param0, v0, v1)); } -int sub_020658DC (LocalMapObject * param0) +int sub_020658DC (MapObject * param0) { sub_020658B4(param0); @@ -405,25 +405,25 @@ int sub_020658DC (LocalMapObject * param0) return 0; } - sub_020628C4(param0, (1 << 5)); + MapObject_SetFlagOff(param0, (1 << 5)); sub_02062BB0(param0, 0xff); sub_02062BC0(param0, 0); return 1; } -static int sub_02065910 (LocalMapObject * param0, int param1, int param2) +static int sub_02065910 (MapObject * param0, int param1, int param2) { return Unk_020EE4B8[param1][param2](param0); } -static int sub_02065924 (LocalMapObject * param0) +static int sub_02065924 (MapObject * param0) { - sub_020628BC(param0, (1 << 5)); + MapObject_SetFlagOn(param0, (1 << 5)); return 0; } -static void sub_02065930 (LocalMapObject * param0, int param1) +static void sub_02065930 (MapObject * param0, int param1) { sub_02062974(param0, param1); sub_02062A0C(param0, 0x0); @@ -431,31 +431,31 @@ static void sub_02065930 (LocalMapObject * param0, int param1) sub_02062BC8(param0); } -static int sub_02065950 (LocalMapObject * param0) +static int sub_02065950 (MapObject * param0) { sub_02065930(param0, 0); return 1; } -static int sub_0206595C (LocalMapObject * param0) +static int sub_0206595C (MapObject * param0) { sub_02065930(param0, 1); return 1; } -static int sub_02065968 (LocalMapObject * param0) +static int sub_02065968 (MapObject * param0) { sub_02065930(param0, 2); return 1; } -static int sub_02065974 (LocalMapObject * param0) +static int sub_02065974 (MapObject * param0) { sub_02065930(param0, 3); return 1; } -static void sub_02065980 (LocalMapObject * param0, int param1, fx32 param2, s16 param3, u16 param4) +static void sub_02065980 (MapObject * param0, int param1, fx32 param2, s16 param3, u16 param4) { UnkStruct_02065980 * v0; @@ -469,11 +469,11 @@ static void sub_02065980 (LocalMapObject * param0, int param1, fx32 param2, s16 sub_020641B4(param0, param1); sub_020629A0(param0, param1); sub_02062A0C(param0, param4); - sub_020628BC(param0, (1 << 2)); + MapObject_SetFlagOn(param0, (1 << 2)); sub_02062BC8(param0); } -static int sub_020659C8 (LocalMapObject * param0) +static int sub_020659C8 (MapObject * param0) { UnkStruct_02065980 * v0; @@ -488,7 +488,7 @@ static int sub_020659C8 (LocalMapObject * param0) return 0; } - sub_020628BC(param0, (1 << 3) | (1 << 5)); + MapObject_SetFlagOn(param0, (1 << 3) | (1 << 5)); sub_02064208(param0); sub_02062B68(param0); sub_02062A0C(param0, 0x0); @@ -497,175 +497,175 @@ static int sub_020659C8 (LocalMapObject * param0) return 1; } -static int sub_02065A1C (LocalMapObject * param0) +static int sub_02065A1C (MapObject * param0) { sub_02065980(param0, 0, ((16 * FX32_ONE) / 32), 32, 0x1); return 1; } -static int sub_02065A30 (LocalMapObject * param0) +static int sub_02065A30 (MapObject * param0) { sub_02065980(param0, 1, ((16 * FX32_ONE) / 32), 32, 0x1); return 1; } -static int sub_02065A44 (LocalMapObject * param0) +static int sub_02065A44 (MapObject * param0) { sub_02065980(param0, 2, ((16 * FX32_ONE) / 32), 32, 0x1); return 1; } -static int sub_02065A58 (LocalMapObject * param0) +static int sub_02065A58 (MapObject * param0) { sub_02065980(param0, 3, ((16 * FX32_ONE) / 32), 32, 0x1); return 1; } -static int sub_02065A6C (LocalMapObject * param0) +static int sub_02065A6C (MapObject * param0) { sub_02065980(param0, 0, ((16 * FX32_ONE) / 16), 16, 0x2); return 1; } -static int sub_02065A80 (LocalMapObject * param0) +static int sub_02065A80 (MapObject * param0) { sub_02065980(param0, 1, ((16 * FX32_ONE) / 16), 16, 0x2); return 1; } -static int sub_02065A94 (LocalMapObject * param0) +static int sub_02065A94 (MapObject * param0) { sub_02065980(param0, 2, ((16 * FX32_ONE) / 16), 16, 0x2); return 1; } -static int sub_02065AA8 (LocalMapObject * param0) +static int sub_02065AA8 (MapObject * param0) { sub_02065980(param0, 3, ((16 * FX32_ONE) / 16), 16, 0x2); return 1; } -static int sub_02065ABC (LocalMapObject * param0) +static int sub_02065ABC (MapObject * param0) { sub_02065980(param0, 0, ((16 * FX32_ONE) / 8), 8, 0x3); return 1; } -static int sub_02065AD4 (LocalMapObject * param0) +static int sub_02065AD4 (MapObject * param0) { sub_02065980(param0, 1, ((16 * FX32_ONE) / 8), 8, 0x3); return 1; } -static int sub_02065AE8 (LocalMapObject * param0) +static int sub_02065AE8 (MapObject * param0) { sub_02065980(param0, 2, ((16 * FX32_ONE) / 8), 8, 0x3); return 1; } -static int sub_02065AFC (LocalMapObject * param0) +static int sub_02065AFC (MapObject * param0) { sub_02065980(param0, 3, ((16 * FX32_ONE) / 8), 8, 0x3); return 1; } -static int sub_02065B10 (LocalMapObject * param0) +static int sub_02065B10 (MapObject * param0) { sub_02065980(param0, 0, ((16 * FX32_ONE) / 4), 4, 0x4); return 1; } -static int sub_02065B24 (LocalMapObject * param0) +static int sub_02065B24 (MapObject * param0) { sub_02065980(param0, 1, ((16 * FX32_ONE) / 4), 4, 0x4); return 1; } -static int sub_02065B38 (LocalMapObject * param0) +static int sub_02065B38 (MapObject * param0) { sub_02065980(param0, 2, ((16 * FX32_ONE) / 4), 4, 0x4); return 1; } -static int sub_02065B4C (LocalMapObject * param0) +static int sub_02065B4C (MapObject * param0) { sub_02065980(param0, 3, ((16 * FX32_ONE) / 4), 4, 0x4); return 1; } -static int sub_02065B60 (LocalMapObject * param0) +static int sub_02065B60 (MapObject * param0) { sub_02065980(param0, 0, ((16 * FX32_ONE) / 2), 2, 0x5); return 1; } -static int sub_02065B78 (LocalMapObject * param0) +static int sub_02065B78 (MapObject * param0) { sub_02065980(param0, 1, ((16 * FX32_ONE) / 2), 2, 0x5); return 1; } -static int sub_02065B8C (LocalMapObject * param0) +static int sub_02065B8C (MapObject * param0) { sub_02065980(param0, 2, ((16 * FX32_ONE) / 2), 2, 0x5); return 1; } -static int sub_02065BA0 (LocalMapObject * param0) +static int sub_02065BA0 (MapObject * param0) { sub_02065980(param0, 3, ((16 * FX32_ONE) / 2), 2, 0x5); return 1; } -static int sub_02065BB8 (LocalMapObject * param0) +static int sub_02065BB8 (MapObject * param0) { sub_02065980(param0, 0, ((16 * FX32_ONE) / 1), 1, 0x0); return 1; } -static int sub_02065BCC (LocalMapObject * param0) +static int sub_02065BCC (MapObject * param0) { sub_02065980(param0, 1, ((16 * FX32_ONE) / 1), 1, 0x0); return 1; } -static int sub_02065BE0 (LocalMapObject * param0) +static int sub_02065BE0 (MapObject * param0) { sub_02065980(param0, 2, ((16 * FX32_ONE) / 1), 1, 0x0); return 1; } -static int sub_02065BF4 (LocalMapObject * param0) +static int sub_02065BF4 (MapObject * param0) { sub_02065980(param0, 3, ((16 * FX32_ONE) / 1), 1, 0x0); return 1; } -static int sub_02065C0C (LocalMapObject * param0) +static int sub_02065C0C (MapObject * param0) { sub_02065980(param0, 0, ((16 * FX32_ONE) / 4), 4, ((0x8 + 1))); return 1; } -static int sub_02065C24 (LocalMapObject * param0) +static int sub_02065C24 (MapObject * param0) { sub_02065980(param0, 1, ((16 * FX32_ONE) / 4), 4, ((0x8 + 1))); return 1; } -static int sub_02065C38 (LocalMapObject * param0) +static int sub_02065C38 (MapObject * param0) { sub_02065980(param0, 2, ((16 * FX32_ONE) / 4), 4, ((0x8 + 1))); return 1; } -static int sub_02065C4C (LocalMapObject * param0) +static int sub_02065C4C (MapObject * param0) { sub_02065980(param0, 3, ((16 * FX32_ONE) / 4), 4, ((0x8 + 1))); return 1; } -static void sub_02065C64 (LocalMapObject * param0, int param1, s16 param2, u16 param3) +static void sub_02065C64 (MapObject * param0, int param1, s16 param2, u16 param3) { UnkStruct_02065C64 * v0; @@ -680,7 +680,7 @@ static void sub_02065C64 (LocalMapObject * param0, int param1, s16 param2, u16 p sub_02062BC8(param0); } -static int sub_02065C98 (LocalMapObject * param0) +static int sub_02065C98 (MapObject * param0) { UnkStruct_02065C64 * v0; @@ -691,134 +691,134 @@ static int sub_02065C98 (LocalMapObject * param0) return 0; } - sub_020628BC(param0, (1 << 5)); + MapObject_SetFlagOn(param0, (1 << 5)); sub_02062A0C(param0, 0x0); sub_02062BC8(param0); return 1; } -static int sub_02065CCC (LocalMapObject * param0) +static int sub_02065CCC (MapObject * param0) { sub_02065C64(param0, 0, 32, 0x1); return 1; } -static int sub_02065CDC (LocalMapObject * param0) +static int sub_02065CDC (MapObject * param0) { sub_02065C64(param0, 1, 32, 0x1); return 1; } -static int sub_02065CEC (LocalMapObject * param0) +static int sub_02065CEC (MapObject * param0) { sub_02065C64(param0, 2, 32, 0x1); return 1; } -static int sub_02065CFC (LocalMapObject * param0) +static int sub_02065CFC (MapObject * param0) { sub_02065C64(param0, 3, 32, 0x1); return 1; } -static int sub_02065D0C (LocalMapObject * param0) +static int sub_02065D0C (MapObject * param0) { sub_02065C64(param0, 0, 16, 0x2); return 1; } -static int sub_02065D1C (LocalMapObject * param0) +static int sub_02065D1C (MapObject * param0) { sub_02065C64(param0, 1, 16, 0x2); return 1; } -static int sub_02065D2C (LocalMapObject * param0) +static int sub_02065D2C (MapObject * param0) { sub_02065C64(param0, 2, 16, 0x2); return 1; } -static int sub_02065D3C (LocalMapObject * param0) +static int sub_02065D3C (MapObject * param0) { sub_02065C64(param0, 3, 16, 0x2); return 1; } -static int sub_02065D4C (LocalMapObject * param0) +static int sub_02065D4C (MapObject * param0) { sub_02065C64(param0, 0, 8, 0x3); return 1; } -static int sub_02065D5C (LocalMapObject * param0) +static int sub_02065D5C (MapObject * param0) { sub_02065C64(param0, 1, 8, 0x3); return 1; } -static int sub_02065D6C (LocalMapObject * param0) +static int sub_02065D6C (MapObject * param0) { sub_02065C64(param0, 2, 8, 0x3); return 1; } -static int sub_02065D7C (LocalMapObject * param0) +static int sub_02065D7C (MapObject * param0) { sub_02065C64(param0, 3, 8, 0x3); return 1; } -static int sub_02065D8C (LocalMapObject * param0) +static int sub_02065D8C (MapObject * param0) { sub_02065C64(param0, 0, 4, 0x4); return 1; } -static int sub_02065D9C (LocalMapObject * param0) +static int sub_02065D9C (MapObject * param0) { sub_02065C64(param0, 1, 4, 0x4); return 1; } -static int sub_02065DAC (LocalMapObject * param0) +static int sub_02065DAC (MapObject * param0) { sub_02065C64(param0, 2, 4, 0x4); return 1; } -static int sub_02065DBC (LocalMapObject * param0) +static int sub_02065DBC (MapObject * param0) { sub_02065C64(param0, 3, 4, 0x4); return 1; } -static int sub_02065DCC (LocalMapObject * param0) +static int sub_02065DCC (MapObject * param0) { sub_02065C64(param0, 0, 2, 0x5); return 1; } -static int sub_02065DDC (LocalMapObject * param0) +static int sub_02065DDC (MapObject * param0) { sub_02065C64(param0, 1, 2, 0x5); return 1; } -static int sub_02065DEC (LocalMapObject * param0) +static int sub_02065DEC (MapObject * param0) { sub_02065C64(param0, 2, 2, 0x5); return 1; } -static int sub_02065DFC (LocalMapObject * param0) +static int sub_02065DFC (MapObject * param0) { sub_02065C64(param0, 3, 2, 0x5); return 1; } -static void sub_02065E0C (LocalMapObject * param0, int param1, fx32 param2, s16 param3, u16 param4, s16 param5, u16 param6, u32 param7) +static void sub_02065E0C (MapObject * param0, int param1, fx32 param2, s16 param3, u16 param4, s16 param5, u16 param6, u32 param7) { UnkStruct_02065E0C * v0; @@ -837,7 +837,7 @@ static void sub_02065E0C (LocalMapObject * param0, int param1, fx32 param2, s16 sub_020641B4(param0, param1); } - sub_020628BC(param0, (1 << 2) | (1 << 16)); + MapObject_SetFlagOn(param0, (1 << 2) | (1 << 16)); sub_020629A0(param0, param1); sub_02062A0C(param0, param4); sub_02062BC8(param0); @@ -847,12 +847,12 @@ static void sub_02065E0C (LocalMapObject * param0, int param1, fx32 param2, s16 } } -static void sub_02065E7C (LocalMapObject * param0, int param1, fx32 param2, s16 param3, u16 param4, s16 param5, u16 param6) +static void sub_02065E7C (MapObject * param0, int param1, fx32 param2, s16 param3, u16 param4, s16 param5, u16 param6) { sub_02065E0C(param0, param1, param2, param3, param4, param5, param6, 1547); } -static int sub_02065EA0 (LocalMapObject * param0) +static int sub_02065EA0 (MapObject * param0) { UnkStruct_02065E0C * v0; @@ -865,7 +865,7 @@ static int sub_02065EA0 (LocalMapObject * param0) if (v0->unk_04 >= (16 * FX32_ONE)) { v0->unk_04 = 0; sub_020641B4(param0, v0->unk_0C); - sub_020628BC(param0, (1 << 2)); + MapObject_SetFlagOn(param0, (1 << 2)); } { @@ -910,7 +910,7 @@ static int sub_02065EA0 (LocalMapObject * param0) sub_02063088(param0, &v5); } - sub_020628BC(param0, (1 << 3) | (1 << 17) | (1 << 5)); + MapObject_SetFlagOn(param0, (1 << 3) | (1 << 17) | (1 << 5)); sub_02064208(param0); sub_02062B68(param0); sub_02062A0C(param0, 0x0); @@ -920,152 +920,152 @@ static int sub_02065EA0 (LocalMapObject * param0) return 1; } -static int sub_02065F88 (LocalMapObject * param0) +static int sub_02065F88 (MapObject * param0) { sub_02065E7C(param0, 0, 0, 16, 0x2, 0, (0x100 * 1)); return 1; } -static int sub_02065FA8 (LocalMapObject * param0) +static int sub_02065FA8 (MapObject * param0) { sub_02065E7C(param0, 1, 0, 16, 0x2, 0, (0x100 * 1)); return 1; } -static int sub_02065FC8 (LocalMapObject * param0) +static int sub_02065FC8 (MapObject * param0) { sub_02065E7C(param0, 2, 0, 16, 0x2, 0, (0x100 * 1)); return 1; } -static int sub_02065FE8 (LocalMapObject * param0) +static int sub_02065FE8 (MapObject * param0) { sub_02065E7C(param0, 3, 0, 16, 0x2, 0, (0x100 * 1)); return 1; } -static int sub_02066008 (LocalMapObject * param0) +static int sub_02066008 (MapObject * param0) { sub_02065E7C(param0, 0, 0, 8, 0x3, 0, ((0x100 * 2))); return 1; } -static int sub_02066028 (LocalMapObject * param0) +static int sub_02066028 (MapObject * param0) { sub_02065E7C(param0, 1, 0, 8, 0x3, 0, ((0x100 * 2))); return 1; } -static int sub_02066048 (LocalMapObject * param0) +static int sub_02066048 (MapObject * param0) { sub_02065E7C(param0, 2, 0, 8, 0x3, 0, ((0x100 * 2))); return 1; } -static int sub_02066068 (LocalMapObject * param0) +static int sub_02066068 (MapObject * param0) { sub_02065E7C(param0, 3, 0, 8, 0x3, 0, ((0x100 * 2))); return 1; } -static int sub_02066088 (LocalMapObject * param0) +static int sub_02066088 (MapObject * param0) { sub_02065E7C(param0, 0, ((16 * FX32_ONE) / 8), 8, 0x3, 0, ((0x100 * 2))); return 1; } -static int sub_020660A8 (LocalMapObject * param0) +static int sub_020660A8 (MapObject * param0) { sub_02065E7C(param0, 1, ((16 * FX32_ONE) / 8), 8, 0x3, 0, ((0x100 * 2))); return 1; } -static int sub_020660CC (LocalMapObject * param0) +static int sub_020660CC (MapObject * param0) { sub_02065E7C(param0, 2, ((16 * FX32_ONE) / 8), 8, 0x3, 0, ((0x100 * 2))); return 1; } -static int sub_020660F0 (LocalMapObject * param0) +static int sub_020660F0 (MapObject * param0) { sub_02065E7C(param0, 3, ((16 * FX32_ONE) / 8), 8, 0x3, 0, ((0x100 * 2))); return 1; } -static int sub_02066110 (LocalMapObject * param0) +static int sub_02066110 (MapObject * param0) { sub_02065E7C(param0, 0, ((16 * FX32_ONE) / 8), 8 * 2, 0x3, 0, (0x100 * 1)); return 1; } -static int sub_02066130 (LocalMapObject * param0) +static int sub_02066130 (MapObject * param0) { sub_02065E7C(param0, 1, ((16 * FX32_ONE) / 8), 16, 0x3, 0, (0x100 * 1)); return 1; } -static int sub_02066150 (LocalMapObject * param0) +static int sub_02066150 (MapObject * param0) { sub_02065E7C(param0, 2, ((16 * FX32_ONE) / 8), 16, 0x3, 0, (0x100 * 1)); return 1; } -static int sub_02066170 (LocalMapObject * param0) +static int sub_02066170 (MapObject * param0) { sub_02065E7C(param0, 3, ((16 * FX32_ONE) / 8), 16, 0x3, 0, (0x100 * 1)); return 1; } -static int sub_02066194 (LocalMapObject * param0) +static int sub_02066194 (MapObject * param0) { sub_02065E7C(param0, 2, ((16 * FX32_ONE) / 16), 16, ((0x8 + 1)), 0, (((0x100 * ((16 - 1)))) / 16)); return 1; } -static int sub_020661B4 (LocalMapObject * param0) +static int sub_020661B4 (MapObject * param0) { sub_02065E7C(param0, 3, ((16 * FX32_ONE) / 16), 16, ((0x8 + 1)), 0, (((0x100 * ((16 - 1)))) / 16)); return 1; } -static int sub_020661D8 (LocalMapObject * param0) +static int sub_020661D8 (MapObject * param0) { sub_02065E7C(param0, 2, ((16 * FX32_ONE) / 4), 12, ((0x8 + 1) + 1), 0, (((0x100 * ((16 - 1)))) / 12)); return 1; } -static int sub_020661F8 (LocalMapObject * param0) +static int sub_020661F8 (MapObject * param0) { sub_02065E7C(param0, 3, ((16 * FX32_ONE) / 4), 12, ((0x8 + 1) + 1), 0, (((0x100 * ((16 - 1)))) / 12)); return 1; } -static int sub_0206621C (LocalMapObject * param0) +static int sub_0206621C (MapObject * param0) { sub_02065E0C(param0, 0, ((16 * FX32_ONE) / 8), 8 * 3, 0x3, 0, (((0x100 * ((16 - 1)))) / 24), 0); return 1; } -static int sub_02066240 (LocalMapObject * param0) +static int sub_02066240 (MapObject * param0) { sub_02065E0C(param0, 1, ((16 * FX32_ONE) / 8), 8 * 3, 0x3, 0, (((0x100 * ((16 - 1)))) / 24), 0); return 1; } -static int sub_02066264 (LocalMapObject * param0) +static int sub_02066264 (MapObject * param0) { sub_02065E0C(param0, 2, ((16 * FX32_ONE) / 8), 8 * 3, 0x3, 0, (((0x100 * ((16 - 1)))) / 24), 0); return 1; } -static int sub_02066288 (LocalMapObject * param0) +static int sub_02066288 (MapObject * param0) { sub_02065E0C(param0, 3, ((16 * FX32_ONE) / 8), 8 * 3, 0x3, 0, (((0x100 * ((16 - 1)))) / 24), 0); return 1; } -static void sub_020662AC (LocalMapObject * param0, int param1) +static void sub_020662AC (MapObject * param0, int param1) { UnkStruct_020662AC * v0; @@ -1075,7 +1075,7 @@ static void sub_020662AC (LocalMapObject * param0, int param1) sub_02062BC8(param0); } -static int sub_020662C4 (LocalMapObject * param0) +static int sub_020662C4 (MapObject * param0) { UnkStruct_020662AC * v0; @@ -1090,49 +1090,49 @@ static int sub_020662C4 (LocalMapObject * param0) return 1; } -static int sub_020662E4 (LocalMapObject * param0) +static int sub_020662E4 (MapObject * param0) { sub_020662AC(param0, 1); return 1; } -static int sub_020662F0 (LocalMapObject * param0) +static int sub_020662F0 (MapObject * param0) { sub_020662AC(param0, 2); return 1; } -static int sub_020662FC (LocalMapObject * param0) +static int sub_020662FC (MapObject * param0) { sub_020662AC(param0, 4); return 1; } -static int sub_02066308 (LocalMapObject * param0) +static int sub_02066308 (MapObject * param0) { sub_020662AC(param0, 8); return 1; } -static int sub_02066314 (LocalMapObject * param0) +static int sub_02066314 (MapObject * param0) { sub_020662AC(param0, 15); return 1; } -static int sub_02066320 (LocalMapObject * param0) +static int sub_02066320 (MapObject * param0) { sub_020662AC(param0, 16); return 1; } -static int sub_0206632C (LocalMapObject * param0) +static int sub_0206632C (MapObject * param0) { sub_020662AC(param0, 32); return 1; } -static int sub_02066338 (LocalMapObject * param0) +static int sub_02066338 (MapObject * param0) { UnkStruct_02066338 * v0; @@ -1145,7 +1145,7 @@ static int sub_02066338 (LocalMapObject * param0) return 1; } -static int sub_0206635C (LocalMapObject * param0) +static int sub_0206635C (MapObject * param0) { int v0; UnkStruct_02066338 * v1; @@ -1170,7 +1170,7 @@ static int sub_0206635C (LocalMapObject * param0) return 1; } -static int sub_020663A4 (LocalMapObject * param0) +static int sub_020663A4 (MapObject * param0) { UnkStruct_02066338 * v0; @@ -1185,7 +1185,7 @@ static int sub_020663A4 (LocalMapObject * param0) return 1; } -static int sub_020663D0 (LocalMapObject * param0) +static int sub_020663D0 (MapObject * param0) { UnkStruct_02066338 * v0; @@ -1211,55 +1211,55 @@ static int sub_020663D0 (LocalMapObject * param0) return 1; } -static int sub_02066418 (LocalMapObject * param0) +static int sub_02066418 (MapObject * param0) { - sub_020628BC(param0, (1 << 9)); + MapObject_SetFlagOn(param0, (1 << 9)); sub_02062BC8(param0); return 1; } -static int sub_02066430 (LocalMapObject * param0) +static int sub_02066430 (MapObject * param0) { - sub_020628C4(param0, (1 << 9)); + MapObject_SetFlagOff(param0, (1 << 9)); sub_02062BC8(param0); return 1; } -static int sub_02066448 (LocalMapObject * param0) +static int sub_02066448 (MapObject * param0) { - sub_020628BC(param0, (1 << 7)); + MapObject_SetFlagOn(param0, (1 << 7)); sub_02062BC8(param0); return 1; } -static int sub_0206645C (LocalMapObject * param0) +static int sub_0206645C (MapObject * param0) { - sub_020628C4(param0, (1 << 7)); + MapObject_SetFlagOff(param0, (1 << 7)); sub_02062BC8(param0); return 1; } -static int sub_02066470 (LocalMapObject * param0) +static int sub_02066470 (MapObject * param0) { - sub_020628BC(param0, (1 << 8)); + MapObject_SetFlagOn(param0, (1 << 8)); sub_02062BC8(param0); return 1; } -static int sub_02066488 (LocalMapObject * param0) +static int sub_02066488 (MapObject * param0) { - sub_020628C4(param0, (1 << 8)); + MapObject_SetFlagOff(param0, (1 << 8)); sub_02062BC8(param0); return 1; } -static void sub_020664A0 (LocalMapObject * param0, int param1, int param2) +static void sub_020664A0 (MapObject * param0, int param1, int param2) { UnkStruct_020664A0 * v0; @@ -1271,7 +1271,7 @@ static void sub_020664A0 (LocalMapObject * param0, int param1, int param2) sub_02062BC8(param0); } -static int sub_020664C8 (LocalMapObject * param0) +static int sub_020664C8 (MapObject * param0) { UnkStruct_020664A0 * v0; @@ -1286,25 +1286,25 @@ static int sub_020664C8 (LocalMapObject * param0) return 0; } -static int sub_020664F0 (LocalMapObject * param0) +static int sub_020664F0 (MapObject * param0) { sub_020664A0(param0, 0, 0); return 0; } -static int sub_02066500 (LocalMapObject * param0) +static int sub_02066500 (MapObject * param0) { sub_020664A0(param0, 1, 0); return 0; } -static int sub_02066510 (LocalMapObject * param0) +static int sub_02066510 (MapObject * param0) { sub_020664A0(param0, 0, 1); return 0; } -static void sub_02066520 (LocalMapObject * param0, int param1, s16 param2, u16 param3) +static void sub_02066520 (MapObject * param0, int param1, s16 param2, u16 param3) { UnkStruct_02066520 * v0; @@ -1317,11 +1317,11 @@ static void sub_02066520 (LocalMapObject * param0, int param1, s16 param2, u16 p sub_020641B4(param0, param1); sub_020629A0(param0, param1); sub_02062A0C(param0, param3); - sub_020628BC(param0, (1 << 2)); + MapObject_SetFlagOn(param0, (1 << 2)); sub_02062BC8(param0); } -static int sub_02066560 (LocalMapObject * param0, const fx32 * param1) +static int sub_02066560 (MapObject * param0, const fx32 * param1) { UnkStruct_02066520 * v0; @@ -1336,7 +1336,7 @@ static int sub_02066560 (LocalMapObject * param0, const fx32 * param1) return 0; } - sub_020628BC(param0, (1 << 3) | (1 << 5)); + MapObject_SetFlagOn(param0, (1 << 3) | (1 << 5)); sub_02064208(param0); sub_02062B68(param0); sub_02062A0C(param0, 0x0); @@ -1345,31 +1345,31 @@ static int sub_02066560 (LocalMapObject * param0, const fx32 * param1) return 1; } -static int sub_020665C0 (LocalMapObject * param0) +static int sub_020665C0 (MapObject * param0) { sub_02066520(param0, 0, 6, 0x6); return 1; } -static int sub_020665D0 (LocalMapObject * param0) +static int sub_020665D0 (MapObject * param0) { sub_02066520(param0, 1, 6, 0x6); return 1; } -static int sub_020665E0 (LocalMapObject * param0) +static int sub_020665E0 (MapObject * param0) { sub_02066520(param0, 2, 6, 0x6); return 1; } -static int sub_020665F0 (LocalMapObject * param0) +static int sub_020665F0 (MapObject * param0) { sub_02066520(param0, 3, 6, 0x6); return 1; } -static int sub_02066600 (LocalMapObject * param0) +static int sub_02066600 (MapObject * param0) { if (sub_02066560(param0, Unk_020EEE6C) == 1) { return 1; @@ -1378,31 +1378,31 @@ static int sub_02066600 (LocalMapObject * param0) return 0; } -static int sub_02066618 (LocalMapObject * param0) +static int sub_02066618 (MapObject * param0) { sub_02066520(param0, 0, 3, 0x7); return 1; } -static int sub_02066628 (LocalMapObject * param0) +static int sub_02066628 (MapObject * param0) { sub_02066520(param0, 1, 3, 0x7); return 1; } -static int sub_02066638 (LocalMapObject * param0) +static int sub_02066638 (MapObject * param0) { sub_02066520(param0, 2, 3, 0x7); return 1; } -static int sub_02066648 (LocalMapObject * param0) +static int sub_02066648 (MapObject * param0) { sub_02066520(param0, 3, 3, 0x7); return 1; } -static int sub_02066658 (LocalMapObject * param0) +static int sub_02066658 (MapObject * param0) { if (sub_02066560(param0, Unk_020EECEC) == 1) { return 1; @@ -1411,31 +1411,31 @@ static int sub_02066658 (LocalMapObject * param0) return 0; } -static int sub_02066670 (LocalMapObject * param0) +static int sub_02066670 (MapObject * param0) { sub_02066520(param0, 0, 7, 0x8); return 1; } -static int sub_02066680 (LocalMapObject * param0) +static int sub_02066680 (MapObject * param0) { sub_02066520(param0, 1, 7, 0x8); return 1; } -static int sub_02066690 (LocalMapObject * param0) +static int sub_02066690 (MapObject * param0) { sub_02066520(param0, 2, 7, 0x8); return 1; } -static int sub_020666A0 (LocalMapObject * param0) +static int sub_020666A0 (MapObject * param0) { sub_02066520(param0, 3, 7, 0x8); return 1; } -static int sub_020666B0 (LocalMapObject * param0) +static int sub_020666B0 (MapObject * param0) { if (sub_02066560(param0, Unk_020EEE84) == 1) { return 1; @@ -1444,7 +1444,7 @@ static int sub_020666B0 (LocalMapObject * param0) return 0; } -static int sub_020666C8 (LocalMapObject * param0) +static int sub_020666C8 (MapObject * param0) { UnkStruct_020666C8 * v0 = sub_02062AA4(param0, (sizeof(UnkStruct_020666C8))); @@ -1454,7 +1454,7 @@ static int sub_020666C8 (LocalMapObject * param0) return 0; } -static int sub_020666E4 (LocalMapObject * param0) +static int sub_020666E4 (MapObject * param0) { UnkStruct_020666C8 * v0 = sub_02062AC8(param0); @@ -1469,7 +1469,7 @@ static int sub_020666E4 (LocalMapObject * param0) return 0; } -static int sub_02066710 (LocalMapObject * param0) +static int sub_02066710 (MapObject * param0) { UnkStruct_02066710 * v0 = sub_02062AA4(param0, (sizeof(UnkStruct_02066710))); @@ -1488,14 +1488,14 @@ static int sub_02066710 (LocalMapObject * param0) ov5_021F3F10(param0); - sub_020628BC(param0, (1 << 2) | (1 << 16)); - sub_020628C4(param0, (1 << 20)); + MapObject_SetFlagOn(param0, (1 << 2) | (1 << 16)); + MapObject_SetFlagOff(param0, (1 << 20)); sub_02062BC8(param0); return 0; } -static int sub_02066764 (LocalMapObject * param0) +static int sub_02066764 (MapObject * param0) { UnkStruct_02066710 * v0 = sub_02062AC8(param0); const fx32 * v1 = Unk_02100B84[0]; @@ -1513,14 +1513,14 @@ static int sub_02066764 (LocalMapObject * param0) v2.y = 0; sub_02063088(param0, &v2); - sub_020628BC(param0, (1 << 3) | (1 << 17) | (1 << 5)); + MapObject_SetFlagOn(param0, (1 << 3) | (1 << 17) | (1 << 5)); sub_0206A230(param0); sub_02062BC8(param0); return 1; } -static int sub_020667CC (LocalMapObject * param0) +static int sub_020667CC (MapObject * param0) { UnkStruct_020667CC * v0 = sub_02062AA4(param0, (sizeof(UnkStruct_020667CC))); @@ -1530,7 +1530,7 @@ static int sub_020667CC (LocalMapObject * param0) return 0; } -static int sub_020667E8 (LocalMapObject * param0) +static int sub_020667E8 (MapObject * param0) { UnkStruct_020667CC * v0 = sub_02062AA4(param0, (sizeof(UnkStruct_020667CC))); @@ -1540,7 +1540,7 @@ static int sub_020667E8 (LocalMapObject * param0) return 0; } -static int sub_02066804 (LocalMapObject * param0) +static int sub_02066804 (MapObject * param0) { UnkStruct_020667CC * v0 = sub_02062AC8(param0); @@ -1554,7 +1554,7 @@ static int sub_02066804 (LocalMapObject * param0) return 1; } -static void sub_02066824 (LocalMapObject * param0, const VecFx32 * param1, int param2, int param3, int param4, u8 param5) +static void sub_02066824 (MapObject * param0, const VecFx32 * param1, int param2, int param3, int param4, u8 param5) { UnkStruct_02066824 * v0; @@ -1592,7 +1592,7 @@ static void sub_02066824 (LocalMapObject * param0, const VecFx32 * param1, int p sub_02062BC8(param0); } -static int sub_020668EC (LocalMapObject * param0) +static int sub_020668EC (MapObject * param0) { UnkStruct_02066824 * v0; @@ -1605,7 +1605,7 @@ static int sub_020668EC (LocalMapObject * param0) return 0; } - sub_020628BC( + MapObject_SetFlagOn( param0, (1 << 3) | (1 << 5)); sub_02064208(param0); @@ -1616,7 +1616,7 @@ static int sub_020668EC (LocalMapObject * param0) return 1; } -static int sub_02066934 (LocalMapObject * param0) +static int sub_02066934 (MapObject * param0) { VecFx32 v0 = {0, ((16 * FX32_ONE) / 8), 0}; @@ -1624,7 +1624,7 @@ static int sub_02066934 (LocalMapObject * param0) return 1; } -static int sub_02066968 (LocalMapObject * param0) +static int sub_02066968 (MapObject * param0) { VecFx32 v0 = {0, -((16 * FX32_ONE) / 8), 0}; @@ -1632,7 +1632,7 @@ static int sub_02066968 (LocalMapObject * param0) return 1; } -static int sub_02066998 (LocalMapObject * param0) +static int sub_02066998 (MapObject * param0) { VecFx32 v0 = {0, 0, ((16 * FX32_ONE) / 8)}; @@ -1640,7 +1640,7 @@ static int sub_02066998 (LocalMapObject * param0) return 1; } -static int sub_020669CC (LocalMapObject * param0) +static int sub_020669CC (MapObject * param0) { VecFx32 v0 = {0, 0, -((16 * FX32_ONE) / 8)}; @@ -1648,7 +1648,7 @@ static int sub_020669CC (LocalMapObject * param0) return 1; } -static int sub_020669FC (LocalMapObject * param0) +static int sub_020669FC (MapObject * param0) { VecFx32 v0 = {0, ((16 * FX32_ONE) / 8), 0}; @@ -1656,7 +1656,7 @@ static int sub_020669FC (LocalMapObject * param0) return 1; } -static int sub_02066A2C (LocalMapObject * param0) +static int sub_02066A2C (MapObject * param0) { VecFx32 v0 = {0, -((16 * FX32_ONE) / 8), 0}; @@ -1664,7 +1664,7 @@ static int sub_02066A2C (LocalMapObject * param0) return 1; } -static int sub_02066A60 (LocalMapObject * param0) +static int sub_02066A60 (MapObject * param0) { VecFx32 v0 = {0, 0, -((16 * FX32_ONE) / 8)}; @@ -1672,7 +1672,7 @@ static int sub_02066A60 (LocalMapObject * param0) return 1; } -static int sub_02066A94 (LocalMapObject * param0) +static int sub_02066A94 (MapObject * param0) { VecFx32 v0 = {0, 0, ((16 * FX32_ONE) / 8)}; @@ -1680,7 +1680,7 @@ static int sub_02066A94 (LocalMapObject * param0) return 1; } -static int sub_02066AC8 (LocalMapObject * param0) +static int sub_02066AC8 (MapObject * param0) { VecFx32 v0 = {0, 0, ((16 * FX32_ONE) / 8)}; @@ -1688,7 +1688,7 @@ static int sub_02066AC8 (LocalMapObject * param0) return 1; } -static int sub_02066AFC (LocalMapObject * param0) +static int sub_02066AFC (MapObject * param0) { VecFx32 v0 = {0, 0, -((16 * FX32_ONE) / 8)}; @@ -1696,7 +1696,7 @@ static int sub_02066AFC (LocalMapObject * param0) return 1; } -static int sub_02066B30 (LocalMapObject * param0) +static int sub_02066B30 (MapObject * param0) { VecFx32 v0 = {-((16 * FX32_ONE) / 8), 0, 0}; @@ -1704,7 +1704,7 @@ static int sub_02066B30 (LocalMapObject * param0) return 1; } -static int sub_02066B60 (LocalMapObject * param0) +static int sub_02066B60 (MapObject * param0) { VecFx32 v0 = {((16 * FX32_ONE) / 8), 0, 0}; @@ -1712,7 +1712,7 @@ static int sub_02066B60 (LocalMapObject * param0) return 1; } -static int sub_02066B90 (LocalMapObject * param0) +static int sub_02066B90 (MapObject * param0) { VecFx32 v0 = {0, 0, ((16 * FX32_ONE) / 4)}; @@ -1720,7 +1720,7 @@ static int sub_02066B90 (LocalMapObject * param0) return 1; } -static int sub_02066BC0 (LocalMapObject * param0) +static int sub_02066BC0 (MapObject * param0) { VecFx32 v0 = {0, 0, -((16 * FX32_ONE) / 4)}; @@ -1728,7 +1728,7 @@ static int sub_02066BC0 (LocalMapObject * param0) return 1; } -static int sub_02066BF0 (LocalMapObject * param0) +static int sub_02066BF0 (MapObject * param0) { VecFx32 v0 = {-((16 * FX32_ONE) / 4), 0, 0}; @@ -1736,7 +1736,7 @@ static int sub_02066BF0 (LocalMapObject * param0) return 1; } -static int sub_02066C20 (LocalMapObject * param0) +static int sub_02066C20 (MapObject * param0) { VecFx32 v0 = {((16 * FX32_ONE) / 4), 0, 0}; @@ -1744,7 +1744,7 @@ static int sub_02066C20 (LocalMapObject * param0) return 1; } -static int sub_02066C50 (LocalMapObject * param0) +static int sub_02066C50 (MapObject * param0) { VecFx32 v0 = {0, 0, ((16 * FX32_ONE) / 2)}; @@ -1752,7 +1752,7 @@ static int sub_02066C50 (LocalMapObject * param0) return 1; } -static int sub_02066C84 (LocalMapObject * param0) +static int sub_02066C84 (MapObject * param0) { VecFx32 v0 = {0, 0, -((16 * FX32_ONE) / 2)}; @@ -1760,7 +1760,7 @@ static int sub_02066C84 (LocalMapObject * param0) return 1; } -static int sub_02066CB8 (LocalMapObject * param0) +static int sub_02066CB8 (MapObject * param0) { VecFx32 v0 = {-((16 * FX32_ONE) / 2), 0, 0}; @@ -1768,7 +1768,7 @@ static int sub_02066CB8 (LocalMapObject * param0) return 1; } -static int sub_02066CE8 (LocalMapObject * param0) +static int sub_02066CE8 (MapObject * param0) { VecFx32 v0 = {((16 * FX32_ONE) / 2), 0, 0}; @@ -1776,7 +1776,7 @@ static int sub_02066CE8 (LocalMapObject * param0) return 1; } -static int sub_02066D18 (LocalMapObject * param0) +static int sub_02066D18 (MapObject * param0) { VecFx32 v0 = {0, ((16 * FX32_ONE) / 4), 0}; @@ -1784,7 +1784,7 @@ static int sub_02066D18 (LocalMapObject * param0) return 1; } -static int sub_02066D4C (LocalMapObject * param0) +static int sub_02066D4C (MapObject * param0) { VecFx32 v0 = {0, -((16 * FX32_ONE) / 4), 0}; @@ -1792,7 +1792,7 @@ static int sub_02066D4C (LocalMapObject * param0) return 1; } -static int sub_02066D80 (LocalMapObject * param0) +static int sub_02066D80 (MapObject * param0) { VecFx32 v0 = {0, 0, ((16 * FX32_ONE) / 4)}; @@ -1800,7 +1800,7 @@ static int sub_02066D80 (LocalMapObject * param0) return 1; } -static int sub_02066DB4 (LocalMapObject * param0) +static int sub_02066DB4 (MapObject * param0) { VecFx32 v0 = {0, 0, -((16 * FX32_ONE) / 4)}; @@ -1808,7 +1808,7 @@ static int sub_02066DB4 (LocalMapObject * param0) return 1; } -static int sub_02066DE8 (LocalMapObject * param0) +static int sub_02066DE8 (MapObject * param0) { VecFx32 v0 = {0, ((16 * FX32_ONE) / 4), 0}; @@ -1816,7 +1816,7 @@ static int sub_02066DE8 (LocalMapObject * param0) return 1; } -static int sub_02066E1C (LocalMapObject * param0) +static int sub_02066E1C (MapObject * param0) { VecFx32 v0 = {0, -((16 * FX32_ONE) / 4), 0}; @@ -1824,7 +1824,7 @@ static int sub_02066E1C (LocalMapObject * param0) return 1; } -static int sub_02066E50 (LocalMapObject * param0) +static int sub_02066E50 (MapObject * param0) { VecFx32 v0 = {0, 0, -((16 * FX32_ONE) / 4)}; @@ -1832,7 +1832,7 @@ static int sub_02066E50 (LocalMapObject * param0) return 1; } -static int sub_02066E84 (LocalMapObject * param0) +static int sub_02066E84 (MapObject * param0) { VecFx32 v0 = {0, 0, ((16 * FX32_ONE) / 4)}; @@ -1840,7 +1840,7 @@ static int sub_02066E84 (LocalMapObject * param0) return 1; } -static int sub_02066EB8 (LocalMapObject * param0) +static int sub_02066EB8 (MapObject * param0) { VecFx32 v0 = {0, 0, ((16 * FX32_ONE) / 4)}; @@ -1848,7 +1848,7 @@ static int sub_02066EB8 (LocalMapObject * param0) return 1; } -static int sub_02066EEC (LocalMapObject * param0) +static int sub_02066EEC (MapObject * param0) { VecFx32 v0 = {0, 0, -((16 * FX32_ONE) / 4)}; @@ -1856,7 +1856,7 @@ static int sub_02066EEC (LocalMapObject * param0) return 1; } -static int sub_02066F20 (LocalMapObject * param0) +static int sub_02066F20 (MapObject * param0) { VecFx32 v0 = {-((16 * FX32_ONE) / 4), 0, 0}; @@ -1864,7 +1864,7 @@ static int sub_02066F20 (LocalMapObject * param0) return 1; } -static int sub_02066F54 (LocalMapObject * param0) +static int sub_02066F54 (MapObject * param0) { VecFx32 v0 = {((16 * FX32_ONE) / 4), 0, 0}; @@ -1872,7 +1872,7 @@ static int sub_02066F54 (LocalMapObject * param0) return 1; } -static void sub_02066F88 (LocalMapObject * param0, fx32 param1, int param2, int param3, u8 param4, u8 param5, u8 param6, u8 param7, u8 param8) +static void sub_02066F88 (MapObject * param0, fx32 param1, int param2, int param3, u8 param4, u8 param5, u8 param6, u8 param7, u8 param8) { int v0 = 1; UnkStruct_02066F88 * v1; @@ -1926,7 +1926,7 @@ static void sub_02066F88 (LocalMapObject * param0, fx32 param1, int param2, int sub_02062BC8(param0); } -static int sub_02067068 (LocalMapObject * param0) +static int sub_02067068 (MapObject * param0) { fx32 v0; VecFx32 v1; @@ -2034,7 +2034,7 @@ static int sub_02067068 (LocalMapObject * param0) sub_02063088(param0, &v7); } - sub_020628BC(param0, (1 << 3) | (1 << 17) | (1 << 5)); + MapObject_SetFlagOn(param0, (1 << 3) | (1 << 17) | (1 << 5)); sub_02064208(param0); sub_02062B68(param0); sub_02062A0C(param0, 0x0); @@ -2044,691 +2044,691 @@ static int sub_02067068 (LocalMapObject * param0) return 1; } -static int sub_020671F0 (LocalMapObject * param0) +static int sub_020671F0 (MapObject * param0) { sub_02066F88(param0, ((16 * FX32_ONE) / 8), 2, 0, 8, 0x3, 1, 1, 0); return 1; } -static int sub_02067214 (LocalMapObject * param0) +static int sub_02067214 (MapObject * param0) { sub_02066F88(param0, -((16 * FX32_ONE) / 8), 3, 1, 8, 0x3, 1, 1, 0); return 1; } -static int sub_0206723C (LocalMapObject * param0) +static int sub_0206723C (MapObject * param0) { sub_02066F88(param0, ((16 * FX32_ONE) / 8), 1, 2, 8, 0x3, 2, 1, 0); return 1; } -static int sub_02067260 (LocalMapObject * param0) +static int sub_02067260 (MapObject * param0) { sub_02066F88(param0, -((16 * FX32_ONE) / 8), 0, 3, 8, 0x3, 2, 1, 0); return 1; } -static int sub_02067288 (LocalMapObject * param0) +static int sub_02067288 (MapObject * param0) { sub_02066F88(param0, ((16 * FX32_ONE) / 8), 3, 0, 8, 0x3, 1, 1, 0); return 1; } -static int sub_020672AC (LocalMapObject * param0) +static int sub_020672AC (MapObject * param0) { sub_02066F88(param0, -((16 * FX32_ONE) / 8), 2, 1, 8, 0x3, 1, 1, 0); return 1; } -static int sub_020672D4 (LocalMapObject * param0) +static int sub_020672D4 (MapObject * param0) { sub_02066F88(param0, -((16 * FX32_ONE) / 8), 0, 2, 8, 0x3, 2, 1, 0); return 1; } -static int sub_020672FC (LocalMapObject * param0) +static int sub_020672FC (MapObject * param0) { sub_02066F88(param0, ((16 * FX32_ONE) / 8), 1, 2, 8, 0x3, 2, 1, 0); return 1; } -static int sub_02067320 (LocalMapObject * param0) +static int sub_02067320 (MapObject * param0) { sub_02066F88(param0, ((16 * FX32_ONE) / 8), 1, 0, 8, 0x3, 2, 1, 0); return 1; } -static int sub_02067344 (LocalMapObject * param0) +static int sub_02067344 (MapObject * param0) { sub_02066F88(param0, -((16 * FX32_ONE) / 8), 0, 1, 8, 0x3, 2, 1, 0); return 1; } -static int sub_0206736C (LocalMapObject * param0) +static int sub_0206736C (MapObject * param0) { sub_02066F88(param0, -((16 * FX32_ONE) / 8), 3, 2, 8, 0x3, 0, 1, 0); return 1; } -static int sub_02067394 (LocalMapObject * param0) +static int sub_02067394 (MapObject * param0) { sub_02066F88(param0, ((16 * FX32_ONE) / 8), 2, 3, 8, 0x3, 0, 1, 0); return 1; } -int(*const Unk_020EEC78[])(LocalMapObject *) = { +int(*const Unk_020EEC78[])(MapObject *) = { sub_02065950, sub_02065924, }; -int(*const Unk_020EEC48[])(LocalMapObject *) = { +int(*const Unk_020EEC48[])(MapObject *) = { sub_0206595C, sub_02065924, }; -int(*const Unk_020EEC88[])(LocalMapObject *) = { +int(*const Unk_020EEC88[])(MapObject *) = { sub_02065968, sub_02065924, }; -int(*const Unk_020EEC80[])(LocalMapObject *) = { +int(*const Unk_020EEC80[])(MapObject *) = { sub_02065974, sub_02065924, }; -int(*const Unk_020EF59C[])(LocalMapObject *) = { +int(*const Unk_020EF59C[])(MapObject *) = { sub_02065A1C, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF590[])(LocalMapObject *) = { +int(*const Unk_020EF590[])(MapObject *) = { sub_02065A30, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF584[])(LocalMapObject *) = { +int(*const Unk_020EF584[])(MapObject *) = { sub_02065A44, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF578[])(LocalMapObject *) = { +int(*const Unk_020EF578[])(MapObject *) = { sub_02065A58, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF56C[])(LocalMapObject *) = { +int(*const Unk_020EF56C[])(MapObject *) = { sub_02065A6C, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF560[])(LocalMapObject *) = { +int(*const Unk_020EF560[])(MapObject *) = { sub_02065A80, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF554[])(LocalMapObject *) = { +int(*const Unk_020EF554[])(MapObject *) = { sub_02065A94, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF548[])(LocalMapObject *) = { +int(*const Unk_020EF548[])(MapObject *) = { sub_02065AA8, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF53C[])(LocalMapObject *) = { +int(*const Unk_020EF53C[])(MapObject *) = { sub_02065ABC, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF530[])(LocalMapObject *) = { +int(*const Unk_020EF530[])(MapObject *) = { sub_02065AD4, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF524[])(LocalMapObject *) = { +int(*const Unk_020EF524[])(MapObject *) = { sub_02065AE8, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF518[])(LocalMapObject *) = { +int(*const Unk_020EF518[])(MapObject *) = { sub_02065AFC, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF50C[])(LocalMapObject *) = { +int(*const Unk_020EF50C[])(MapObject *) = { sub_02065B10, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF500[])(LocalMapObject *) = { +int(*const Unk_020EF500[])(MapObject *) = { sub_02065B24, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF4F4[])(LocalMapObject *) = { +int(*const Unk_020EF4F4[])(MapObject *) = { sub_02065B38, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF4E8[])(LocalMapObject *) = { +int(*const Unk_020EF4E8[])(MapObject *) = { sub_02065B4C, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF4DC[])(LocalMapObject *) = { +int(*const Unk_020EF4DC[])(MapObject *) = { sub_02065B60, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF4D0[])(LocalMapObject *) = { +int(*const Unk_020EF4D0[])(MapObject *) = { sub_02065B78, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF4C4[])(LocalMapObject *) = { +int(*const Unk_020EF4C4[])(MapObject *) = { sub_02065B8C, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF4B8[])(LocalMapObject *) = { +int(*const Unk_020EF4B8[])(MapObject *) = { sub_02065BA0, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF4AC[])(LocalMapObject *) = { +int(*const Unk_020EF4AC[])(MapObject *) = { sub_02065BB8, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF4A0[])(LocalMapObject *) = { +int(*const Unk_020EF4A0[])(MapObject *) = { sub_02065BCC, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF494[])(LocalMapObject *) = { +int(*const Unk_020EF494[])(MapObject *) = { sub_02065BE0, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF488[])(LocalMapObject *) = { +int(*const Unk_020EF488[])(MapObject *) = { sub_02065BF4, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF47C[])(LocalMapObject *) = { +int(*const Unk_020EF47C[])(MapObject *) = { sub_02065CCC, sub_02065C98, sub_02065924, }; -int(*const Unk_020EF230[])(LocalMapObject *) = { +int(*const Unk_020EF230[])(MapObject *) = { sub_02065CDC, sub_02065C98, sub_02065924, }; -int(*const Unk_020EF458[])(LocalMapObject *) = { +int(*const Unk_020EF458[])(MapObject *) = { sub_02065CEC, sub_02065C98, sub_02065924, }; -int(*const Unk_020EF464[])(LocalMapObject *) = { +int(*const Unk_020EF464[])(MapObject *) = { sub_02065CFC, sub_02065C98, sub_02065924, }; -int(*const Unk_020EF5A8[])(LocalMapObject *) = { +int(*const Unk_020EF5A8[])(MapObject *) = { sub_02065D0C, sub_02065C98, sub_02065924, }; -int(*const Unk_020EF5B4[])(LocalMapObject *) = { +int(*const Unk_020EF5B4[])(MapObject *) = { sub_02065D1C, sub_02065C98, sub_02065924, }; -int(*const Unk_020EF434[])(LocalMapObject *) = { +int(*const Unk_020EF434[])(MapObject *) = { sub_02065D2C, sub_02065C98, sub_02065924, }; -int(*const Unk_020EF428[])(LocalMapObject *) = { +int(*const Unk_020EF428[])(MapObject *) = { sub_02065D3C, sub_02065C98, sub_02065924, }; -int(*const Unk_020EF41C[])(LocalMapObject *) = { +int(*const Unk_020EF41C[])(MapObject *) = { sub_02065D4C, sub_02065C98, sub_02065924, }; -int(*const Unk_020EF410[])(LocalMapObject *) = { +int(*const Unk_020EF410[])(MapObject *) = { sub_02065D5C, sub_02065C98, sub_02065924, }; -int(*const Unk_020EF404[])(LocalMapObject *) = { +int(*const Unk_020EF404[])(MapObject *) = { sub_02065D6C, sub_02065C98, sub_02065924, }; -int(*const Unk_020EF3F8[])(LocalMapObject *) = { +int(*const Unk_020EF3F8[])(MapObject *) = { sub_02065D7C, sub_02065C98, sub_02065924, }; -int(*const Unk_020EF3EC[])(LocalMapObject *) = { +int(*const Unk_020EF3EC[])(MapObject *) = { sub_02065D8C, sub_02065C98, sub_02065924, }; -int(*const Unk_020EF3E0[])(LocalMapObject *) = { +int(*const Unk_020EF3E0[])(MapObject *) = { sub_02065D9C, sub_02065C98, sub_02065924, }; -int(*const Unk_020EF3D4[])(LocalMapObject *) = { +int(*const Unk_020EF3D4[])(MapObject *) = { sub_02065DAC, sub_02065C98, sub_02065924, }; -int(*const Unk_020EF3C8[])(LocalMapObject *) = { +int(*const Unk_020EF3C8[])(MapObject *) = { sub_02065DBC, sub_02065C98, sub_02065924, }; -int(*const Unk_020EF3BC[])(LocalMapObject *) = { +int(*const Unk_020EF3BC[])(MapObject *) = { sub_02065DCC, sub_02065C98, sub_02065924, }; -int(*const Unk_020EF3B0[])(LocalMapObject *) = { +int(*const Unk_020EF3B0[])(MapObject *) = { sub_02065DDC, sub_02065C98, sub_02065924, }; -int(*const Unk_020EF3A4[])(LocalMapObject *) = { +int(*const Unk_020EF3A4[])(MapObject *) = { sub_02065DEC, sub_02065C98, sub_02065924, }; -int(*const Unk_020EF398[])(LocalMapObject *) = { +int(*const Unk_020EF398[])(MapObject *) = { sub_02065DFC, sub_02065C98, sub_02065924, }; -int(*const Unk_020EF38C[])(LocalMapObject *) = { +int(*const Unk_020EF38C[])(MapObject *) = { sub_02065F88, sub_02065EA0, sub_02065924, }; -int(*const Unk_020EF380[])(LocalMapObject *) = { +int(*const Unk_020EF380[])(MapObject *) = { sub_02065FA8, sub_02065EA0, sub_02065924, }; -int(*const Unk_020EF374[])(LocalMapObject *) = { +int(*const Unk_020EF374[])(MapObject *) = { sub_02065FC8, sub_02065EA0, sub_02065924, }; -int(*const Unk_020EF368[])(LocalMapObject *) = { +int(*const Unk_020EF368[])(MapObject *) = { sub_02065FE8, sub_02065EA0, sub_02065924, }; -int(*const Unk_020EF35C[])(LocalMapObject *) = { +int(*const Unk_020EF35C[])(MapObject *) = { sub_02066008, sub_02065EA0, sub_02065924, }; -int(*const Unk_020EF350[])(LocalMapObject *) = { +int(*const Unk_020EF350[])(MapObject *) = { sub_02066028, sub_02065EA0, sub_02065924, }; -int(*const Unk_020EF344[])(LocalMapObject *) = { +int(*const Unk_020EF344[])(MapObject *) = { sub_02066048, sub_02065EA0, sub_02065924, }; -int(*const Unk_020EF338[])(LocalMapObject *) = { +int(*const Unk_020EF338[])(MapObject *) = { sub_02066068, sub_02065EA0, sub_02065924, }; -int(*const Unk_020EF32C[])(LocalMapObject *) = { +int(*const Unk_020EF32C[])(MapObject *) = { sub_02066088, sub_02065EA0, sub_02065924, }; -int(*const Unk_020EF320[])(LocalMapObject *) = { +int(*const Unk_020EF320[])(MapObject *) = { sub_020660A8, sub_02065EA0, sub_02065924, }; -int(*const Unk_020EF314[])(LocalMapObject *) = { +int(*const Unk_020EF314[])(MapObject *) = { sub_020660CC, sub_02065EA0, sub_02065924, }; -int(*const Unk_020EF308[])(LocalMapObject *) = { +int(*const Unk_020EF308[])(MapObject *) = { sub_020660F0, sub_02065EA0, sub_02065924, }; -int(*const Unk_020EF2FC[])(LocalMapObject *) = { +int(*const Unk_020EF2FC[])(MapObject *) = { sub_02066110, sub_02065EA0, sub_02065924, }; -int(*const Unk_020EF2F0[])(LocalMapObject *) = { +int(*const Unk_020EF2F0[])(MapObject *) = { sub_02066130, sub_02065EA0, sub_02065924, }; -int(*const Unk_020EF2E4[])(LocalMapObject *) = { +int(*const Unk_020EF2E4[])(MapObject *) = { sub_02066150, sub_02065EA0, sub_02065924, }; -int(*const Unk_020EF2D8[])(LocalMapObject *) = { +int(*const Unk_020EF2D8[])(MapObject *) = { sub_02066170, sub_02065EA0, sub_02065924, }; -int(*const Unk_020EEC98[])(LocalMapObject *) = { +int(*const Unk_020EEC98[])(MapObject *) = { sub_02066194, sub_02065EA0, sub_02065924, }; -int(*const Unk_020EF2C0[])(LocalMapObject *) = { +int(*const Unk_020EF2C0[])(MapObject *) = { sub_020661B4, sub_02065EA0, sub_02065924, }; -int(*const Unk_020EF2B4[])(LocalMapObject *) = { +int(*const Unk_020EF2B4[])(MapObject *) = { sub_020661D8, sub_02065EA0, sub_02065924, }; -int(*const Unk_020EF2A8[])(LocalMapObject *) = { +int(*const Unk_020EF2A8[])(MapObject *) = { sub_020661F8, sub_02065EA0, sub_02065924, }; -int(*const Unk_020EF29C[])(LocalMapObject *) = { +int(*const Unk_020EF29C[])(MapObject *) = { sub_020662E4, sub_020662C4, sub_02065924, }; -int(*const Unk_020EF290[])(LocalMapObject *) = { +int(*const Unk_020EF290[])(MapObject *) = { sub_020662F0, sub_020662C4, sub_02065924, }; -int(*const Unk_020EF284[])(LocalMapObject *) = { +int(*const Unk_020EF284[])(MapObject *) = { sub_020662FC, sub_020662C4, sub_02065924, }; -int(*const Unk_020EF278[])(LocalMapObject *) = { +int(*const Unk_020EF278[])(MapObject *) = { sub_02066308, sub_020662C4, sub_02065924, }; -int(*const Unk_020EF26C[])(LocalMapObject *) = { +int(*const Unk_020EF26C[])(MapObject *) = { sub_02066314, sub_020662C4, sub_02065924, }; -int(*const Unk_020EF260[])(LocalMapObject *) = { +int(*const Unk_020EF260[])(MapObject *) = { sub_02066320, sub_020662C4, sub_02065924, }; -int(*const Unk_020EF254[])(LocalMapObject *) = { +int(*const Unk_020EF254[])(MapObject *) = { sub_0206632C, sub_020662C4, sub_02065924, }; -int(*const Unk_020EF248[])(LocalMapObject *) = { +int(*const Unk_020EF248[])(MapObject *) = { sub_02066338, sub_0206635C, sub_02065924, }; -int(*const Unk_020EF23C[])(LocalMapObject *) = { +int(*const Unk_020EF23C[])(MapObject *) = { sub_020663A4, sub_020663D0, sub_02065924, }; -int(*const Unk_020EEC70[])(LocalMapObject *) = { +int(*const Unk_020EEC70[])(MapObject *) = { sub_02066418, sub_02065924, }; -int(*const Unk_020EEC68[])(LocalMapObject *) = { +int(*const Unk_020EEC68[])(MapObject *) = { sub_02066430, sub_02065924, }; -int(*const Unk_020EEC50[])(LocalMapObject *) = { +int(*const Unk_020EEC50[])(MapObject *) = { sub_02066448, sub_02065924, }; -int(*const Unk_020EEC90[])(LocalMapObject *) = { +int(*const Unk_020EEC90[])(MapObject *) = { sub_0206645C, sub_02065924, }; -int(*const Unk_020EEC58[])(LocalMapObject *) = { +int(*const Unk_020EEC58[])(MapObject *) = { sub_02066470, sub_02065924, }; -int(*const Unk_020EEC60[])(LocalMapObject *) = { +int(*const Unk_020EEC60[])(MapObject *) = { sub_02066488, sub_02065924, }; -int(*const Unk_020EF218[])(LocalMapObject *) = { +int(*const Unk_020EF218[])(MapObject *) = { sub_020664F0, sub_020664C8, sub_02065924, }; -int(*const Unk_020EF20C[])(LocalMapObject *) = { +int(*const Unk_020EF20C[])(MapObject *) = { sub_02066500, sub_020664C8, sub_02065924, }; -int(*const Unk_020EF200[])(LocalMapObject *) = { +int(*const Unk_020EF200[])(MapObject *) = { sub_020665C0, sub_02066600, sub_02065924, }; -int(*const Unk_020EF1F4[])(LocalMapObject *) = { +int(*const Unk_020EF1F4[])(MapObject *) = { sub_020665D0, sub_02066600, sub_02065924, }; -int(*const Unk_020EF1E8[])(LocalMapObject *) = { +int(*const Unk_020EF1E8[])(MapObject *) = { sub_020665E0, sub_02066600, sub_02065924, }; -int(*const Unk_020EF1DC[])(LocalMapObject *) = { +int(*const Unk_020EF1DC[])(MapObject *) = { sub_020665F0, sub_02066600, sub_02065924, }; -int(*const Unk_020EF1D0[])(LocalMapObject *) = { +int(*const Unk_020EF1D0[])(MapObject *) = { sub_02066618, sub_02066658, sub_02065924, }; -int(*const Unk_020EF1C4[])(LocalMapObject *) = { +int(*const Unk_020EF1C4[])(MapObject *) = { sub_02066628, sub_02066658, sub_02065924, }; -int(*const Unk_020EF1B8[])(LocalMapObject *) = { +int(*const Unk_020EF1B8[])(MapObject *) = { sub_02066638, sub_02066658, sub_02065924, }; -int(*const Unk_020EF188[])(LocalMapObject *) = { +int(*const Unk_020EF188[])(MapObject *) = { sub_02066648, sub_02066658, sub_02065924, }; -int(*const Unk_020EF194[])(LocalMapObject *) = { +int(*const Unk_020EF194[])(MapObject *) = { sub_02065C0C, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF224[])(LocalMapObject *) = { +int(*const Unk_020EF224[])(MapObject *) = { sub_02065C24, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF440[])(LocalMapObject *) = { +int(*const Unk_020EF440[])(MapObject *) = { sub_02065C38, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF470[])(LocalMapObject *) = { +int(*const Unk_020EF470[])(MapObject *) = { sub_02065C4C, sub_020659C8, sub_02065924, }; -int(*const Unk_020EF5C0[])(LocalMapObject *) = { +int(*const Unk_020EF5C0[])(MapObject *) = { sub_02066670, sub_020666B0, sub_02065924, }; -int(*const Unk_020EF164[])(LocalMapObject *) = { +int(*const Unk_020EF164[])(MapObject *) = { sub_02066680, sub_020666B0, sub_02065924, }; -int(*const Unk_020EF158[])(LocalMapObject *) = { +int(*const Unk_020EF158[])(MapObject *) = { sub_02066690, sub_020666B0, sub_02065924, }; -int(*const Unk_020EF14C[])(LocalMapObject *) = { +int(*const Unk_020EF14C[])(MapObject *) = { sub_020666A0, sub_020666B0, sub_02065924, }; -int(*const Unk_020EF140[])(LocalMapObject *) = { +int(*const Unk_020EF140[])(MapObject *) = { sub_020666C8, sub_020666E4, sub_02065924, }; -int(*const Unk_020EF134[])(LocalMapObject *) = { +int(*const Unk_020EF134[])(MapObject *) = { sub_02066710, sub_02066764, sub_02065924, }; -int(*const Unk_020EF128[])(LocalMapObject *) = { +int(*const Unk_020EF128[])(MapObject *) = { sub_020667CC, sub_02066804, sub_02065924, }; -int(*const Unk_020EF11C[])(LocalMapObject *) = { +int(*const Unk_020EF11C[])(MapObject *) = { sub_020667E8, sub_02066804, sub_02065924, }; -int(*const Unk_020EF110[])(LocalMapObject *) = { +int(*const Unk_020EF110[])(MapObject *) = { sub_02066934, sub_020668EC, sub_02065924, }; -int(*const Unk_020EF104[])(LocalMapObject *) = { +int(*const Unk_020EF104[])(MapObject *) = { sub_02066968, sub_020668EC, sub_02065924, }; -int(*const Unk_020EF0F8[])(LocalMapObject *) = { +int(*const Unk_020EF0F8[])(MapObject *) = { sub_02066998, sub_020668EC, sub_02065924, }; -int(*const Unk_020EF0EC[])(LocalMapObject *) = { +int(*const Unk_020EF0EC[])(MapObject *) = { sub_020669CC, sub_020668EC, sub_02065924, }; -int(*const Unk_020EF0E0[])(LocalMapObject *) = { +int(*const Unk_020EF0E0[])(MapObject *) = { sub_020669FC, sub_020668EC, sub_02065924, }; -int(*const Unk_020EF0D4[])(LocalMapObject *) = { +int(*const Unk_020EF0D4[])(MapObject *) = { sub_02066A2C, sub_020668EC, sub_02065924, }; -int(*const Unk_020EF0C8[])(LocalMapObject *) = { +int(*const Unk_020EF0C8[])(MapObject *) = { sub_02066A60, sub_020668EC, sub_02065924, }; -int(*const Unk_020EF0BC[])(LocalMapObject *) = { +int(*const Unk_020EF0BC[])(MapObject *) = { sub_02066A94, sub_020668EC, sub_02065924, }; -int(*const Unk_020EF2CC[])(LocalMapObject *) = { +int(*const Unk_020EF2CC[])(MapObject *) = { sub_02066AC8, sub_020668EC, sub_02065924, }; -int(*const Unk_020EF0A4[])(LocalMapObject *) = { +int(*const Unk_020EF0A4[])(MapObject *) = { sub_02066AFC, sub_020668EC, sub_02065924, }; -int(*const Unk_020EF098[])(LocalMapObject *) = { +int(*const Unk_020EF098[])(MapObject *) = { sub_02066B30, sub_020668EC, sub_02065924, }; -int(*const Unk_020EF08C[])(LocalMapObject *) = { +int(*const Unk_020EF08C[])(MapObject *) = { sub_02066B60, sub_020668EC, sub_02065924, }; -int(*const Unk_020EF080[])(LocalMapObject *) = { +int(*const Unk_020EF080[])(MapObject *) = { sub_02066B90, sub_020668EC, sub_02065924, }; -int(*const Unk_020EF074[])(LocalMapObject *) = { +int(*const Unk_020EF074[])(MapObject *) = { sub_02066BC0, sub_020668EC, sub_02065924, }; -int(*const Unk_020EF068[])(LocalMapObject *) = { +int(*const Unk_020EF068[])(MapObject *) = { sub_02066BF0, sub_020668EC, sub_02065924, }; -int(*const Unk_020EF05C[])(LocalMapObject *) = { +int(*const Unk_020EF05C[])(MapObject *) = { sub_02066C20, sub_020668EC, sub_02065924, }; -int(*const Unk_020EF050[])(LocalMapObject *) = { +int(*const Unk_020EF050[])(MapObject *) = { sub_02066C50, sub_020668EC, sub_02065924, }; -int(*const Unk_020EF044[])(LocalMapObject *) = { +int(*const Unk_020EF044[])(MapObject *) = { sub_02066C84, sub_020668EC, sub_02065924, }; -int(*const Unk_020EF038[])(LocalMapObject *) = { +int(*const Unk_020EF038[])(MapObject *) = { sub_02066CB8, sub_020668EC, sub_02065924, }; -int(*const Unk_020EF014[])(LocalMapObject *) = { +int(*const Unk_020EF014[])(MapObject *) = { sub_02066CE8, sub_020668EC, sub_02065924, }; -int(*const Unk_020EF020[])(LocalMapObject *) = { +int(*const Unk_020EF020[])(MapObject *) = { sub_0206621C, sub_02065EA0, sub_02065924, }; -int(*const Unk_020EF17C[])(LocalMapObject *) = { +int(*const Unk_020EF17C[])(MapObject *) = { sub_02066240, sub_02065EA0, sub_02065924, }; -int(*const Unk_020EF1A0[])(LocalMapObject *) = { +int(*const Unk_020EF1A0[])(MapObject *) = { sub_02066264, sub_02065EA0, sub_02065924, }; -int(*const Unk_020EF44C[])(LocalMapObject *) = { +int(*const Unk_020EF44C[])(MapObject *) = { sub_02066288, sub_02065EA0, sub_02065924, }; -int(*const Unk_020EF5CC[])(LocalMapObject *) = { +int(*const Unk_020EF5CC[])(MapObject *) = { sub_02066D18, sub_020668EC, sub_02065924, }; -int(*const Unk_020EEFF0[])(LocalMapObject *) = { +int(*const Unk_020EEFF0[])(MapObject *) = { sub_02066D4C, sub_020668EC, sub_02065924, }; -int(*const Unk_020EEFE4[])(LocalMapObject *) = { +int(*const Unk_020EEFE4[])(MapObject *) = { sub_02066D80, sub_020668EC, sub_02065924, }; -int(*const Unk_020EEFD8[])(LocalMapObject *) = { +int(*const Unk_020EEFD8[])(MapObject *) = { sub_02066DB4, sub_020668EC, sub_02065924, }; -int(*const Unk_020EEFCC[])(LocalMapObject *) = { +int(*const Unk_020EEFCC[])(MapObject *) = { sub_02066DE8, sub_020668EC, sub_02065924, }; -int(*const Unk_020EEFC0[])(LocalMapObject *) = { +int(*const Unk_020EEFC0[])(MapObject *) = { sub_02066E1C, sub_020668EC, sub_02065924, }; -int(*const Unk_020EEFB4[])(LocalMapObject *) = { +int(*const Unk_020EEFB4[])(MapObject *) = { sub_02066E50, sub_020668EC, sub_02065924, }; -int(*const Unk_020EEFA8[])(LocalMapObject *) = { +int(*const Unk_020EEFA8[])(MapObject *) = { sub_02066E84, sub_020668EC, sub_02065924, }; -int(*const Unk_020EF0B0[])(LocalMapObject *) = { +int(*const Unk_020EF0B0[])(MapObject *) = { sub_02066EB8, sub_020668EC, sub_02065924, }; -int(*const Unk_020EEF90[])(LocalMapObject *) = { +int(*const Unk_020EEF90[])(MapObject *) = { sub_02066EEC, sub_020668EC, sub_02065924, }; -int(*const Unk_020EEF84[])(LocalMapObject *) = { +int(*const Unk_020EEF84[])(MapObject *) = { sub_02066F20, sub_020668EC, sub_02065924, }; -int(*const Unk_020EEF6C[])(LocalMapObject *) = { +int(*const Unk_020EEF6C[])(MapObject *) = { sub_02066F54, sub_020668EC, sub_02065924, }; -int(*const Unk_020EEF78[])(LocalMapObject *) = { +int(*const Unk_020EEF78[])(MapObject *) = { sub_020671F0, sub_02067068, sub_02065924, }; -int(*const Unk_020EF008[])(LocalMapObject *) = { +int(*const Unk_020EF008[])(MapObject *) = { sub_02067214, sub_02067068, sub_02065924, }; -int(*const Unk_020EF02C[])(LocalMapObject *) = { +int(*const Unk_020EF02C[])(MapObject *) = { sub_0206723C, sub_02067068, sub_02065924, }; -int(*const Unk_020EF1AC[])(LocalMapObject *) = { +int(*const Unk_020EF1AC[])(MapObject *) = { sub_02067260, sub_02067068, sub_02065924, }; -int(*const Unk_020EF5D8[])(LocalMapObject *) = { +int(*const Unk_020EF5D8[])(MapObject *) = { sub_02067288, sub_02067068, sub_02065924, }; -int(*const Unk_020EECBC[])(LocalMapObject *) = { +int(*const Unk_020EECBC[])(MapObject *) = { sub_020672AC, sub_02067068, sub_02065924, }; -int(*const Unk_020EECB0[])(LocalMapObject *) = { +int(*const Unk_020EECB0[])(MapObject *) = { sub_020672D4, sub_02067068, sub_02065924, }; -int(*const Unk_020EECA4[])(LocalMapObject *) = { +int(*const Unk_020EECA4[])(MapObject *) = { sub_020672FC, sub_02067068, sub_02065924, }; -int(*const Unk_020EEF9C[])(LocalMapObject *) = { +int(*const Unk_020EEF9C[])(MapObject *) = { sub_02067320, sub_02067068, sub_02065924, }; -int(*const Unk_020EEF60[])(LocalMapObject *) = { +int(*const Unk_020EEF60[])(MapObject *) = { sub_02067344, sub_02067068, sub_02065924, }; -int(*const Unk_020EEFFC[])(LocalMapObject *) = { +int(*const Unk_020EEFFC[])(MapObject *) = { sub_0206736C, sub_02067068, sub_02065924, }; -int(*const Unk_020EF170[])(LocalMapObject *) = { +int(*const Unk_020EF170[])(MapObject *) = { sub_02067394, sub_02067068, sub_02065924, }; -int(*const Unk_020EF5E4[])(LocalMapObject *) = { +int(*const Unk_020EF5E4[])(MapObject *) = { sub_02066510, sub_020664C8, sub_02065924, }; diff --git a/src/unk_020673B8.c b/src/unk_020673B8.c index b12e7f6754..04b05be808 100644 --- a/src/unk_020673B8.c +++ b/src/unk_020673B8.c @@ -31,31 +31,31 @@ typedef struct { s8 unk_08; } UnkStruct_0206762C; -static void sub_020673E4(LocalMapObject * param0); -static int sub_02067400(LocalMapObject * param0); -static int sub_0206741C(LocalMapObject * param0); -static int sub_02067438(LocalMapObject * param0); -static int sub_0206746C(LocalMapObject * param0); -static void sub_020674A0(LocalMapObject * param0); -static int sub_020674A4(LocalMapObject * param0); -static int sub_020674A8(LocalMapObject * param0); -static void sub_020674AC(LocalMapObject * param0); -static int sub_020674C4(LocalMapObject * param0); -static int sub_02067540(LocalMapObject * param0); -static void sub_0206762C(LocalMapObject * param0); -static int sub_02067658(LocalMapObject * param0); -static int sub_020676D4(LocalMapObject * param0); +static void sub_020673E4(MapObject * param0); +static int sub_02067400(MapObject * param0); +static int sub_0206741C(MapObject * param0); +static int sub_02067438(MapObject * param0); +static int sub_0206746C(MapObject * param0); +static void sub_020674A0(MapObject * param0); +static int sub_020674A4(MapObject * param0); +static int sub_020674A8(MapObject * param0); +static void sub_020674AC(MapObject * param0); +static int sub_020674C4(MapObject * param0); +static int sub_02067540(MapObject * param0); +static void sub_0206762C(MapObject * param0); +static int sub_02067658(MapObject * param0); +static int sub_020676D4(MapObject * param0); -void(*const Unk_020EF630[])(LocalMapObject *); -int(*const Unk_020EF660[])(LocalMapObject *); -int(*const Unk_020EF690[])(LocalMapObject *); +void(*const Unk_020EF630[])(MapObject *); +int(*const Unk_020EF660[])(MapObject *); +int(*const Unk_020EF690[])(MapObject *); -void sub_020673B8 (LocalMapObject * param0) +void sub_020673B8 (MapObject * param0) { sub_020673E4(param0); } -int sub_020673C0 (LocalMapObject * param0) +int sub_020673C0 (MapObject * param0) { if (sub_02067400(param0) == 0) { return 0; @@ -68,26 +68,26 @@ int sub_020673C0 (LocalMapObject * param0) return 1; } -static void sub_020673E4 (LocalMapObject * param0) +static void sub_020673E4 (MapObject * param0) { int v0 = sub_02062950(param0); Unk_020EF630[v0](param0); } -static int sub_02067400 (LocalMapObject * param0) +static int sub_02067400 (MapObject * param0) { int v0 = sub_02062950(param0); return Unk_020EF660[v0](param0); } -static int sub_0206741C (LocalMapObject * param0) +static int sub_0206741C (MapObject * param0) { int v0 = sub_02062950(param0); return Unk_020EF690[v0](param0); } -static int sub_02067438 (LocalMapObject * param0) +static int sub_02067438 (MapObject * param0) { int v0 = sub_02063020(param0); int v1 = sub_02063008(param0); @@ -106,7 +106,7 @@ static int sub_02067438 (LocalMapObject * param0) return 0; } -static int sub_0206746C (LocalMapObject * param0) +static int sub_0206746C (MapObject * param0) { int v0 = sub_02063020(param0); int v1 = sub_02063008(param0); @@ -125,22 +125,22 @@ static int sub_0206746C (LocalMapObject * param0) return 1; } -static void sub_020674A0 (LocalMapObject * param0) +static void sub_020674A0 (MapObject * param0) { return; } -static int sub_020674A4 (LocalMapObject * param0) +static int sub_020674A4 (MapObject * param0) { return 0; } -static int sub_020674A8 (LocalMapObject * param0) +static int sub_020674A8 (MapObject * param0) { return 0; } -static void sub_020674AC (LocalMapObject * param0) +static void sub_020674AC (MapObject * param0) { UnkStruct_020674AC * v0; @@ -148,7 +148,7 @@ static void sub_020674AC (LocalMapObject * param0) v0->unk_03 = sub_020629D8(param0, 1); } -static int sub_020674C4 (LocalMapObject * param0) +static int sub_020674C4 (MapObject * param0) { UnkStruct_020674AC * v0; @@ -188,7 +188,7 @@ static int sub_020674C4 (LocalMapObject * param0) return 0; } -static int sub_02067540 (LocalMapObject * param0) +static int sub_02067540 (MapObject * param0) { UnkStruct_020674AC * v0; @@ -249,7 +249,7 @@ static int sub_02067540 (LocalMapObject * param0) return 0; } -static void sub_0206762C (LocalMapObject * param0) +static void sub_0206762C (MapObject * param0) { int v0; UnkStruct_0206762C * v1; @@ -268,7 +268,7 @@ static void sub_0206762C (LocalMapObject * param0) v1->unk_05 = v0; } -static int sub_02067658 (LocalMapObject * param0) +static int sub_02067658 (MapObject * param0) { UnkStruct_0206762C * v0; @@ -309,7 +309,7 @@ static int sub_02067658 (LocalMapObject * param0) return 0; } -static int sub_020676D4 (LocalMapObject * param0) +static int sub_020676D4 (MapObject * param0) { UnkStruct_020674AC * v0; int v1[2][4] = {{0, 2, 1, 3}, {0, 3, 1, 2}}; @@ -374,7 +374,7 @@ static int sub_020676D4 (LocalMapObject * param0) return 0; } -static void(*const Unk_020EF630[])(LocalMapObject *) = { +static void(*const Unk_020EF630[])(MapObject *) = { sub_020674A0, sub_020674A0, sub_020674A0, @@ -389,7 +389,7 @@ static void(*const Unk_020EF630[])(LocalMapObject *) = { sub_020674A0 }; -static int(*const Unk_020EF660[])(LocalMapObject *) = { +static int(*const Unk_020EF660[])(MapObject *) = { sub_020674A4, sub_020674A4, sub_020674A4, @@ -404,7 +404,7 @@ static int(*const Unk_020EF660[])(LocalMapObject *) = { sub_020674A4 }; -static int(*const Unk_020EF690[])(LocalMapObject *) = { +static int(*const Unk_020EF690[])(MapObject *) = { sub_020674A8, sub_020674A8, sub_020674A8, diff --git a/src/unk_020677F4.c b/src/unk_020677F4.c index 2335440a8d..96aaf65c57 100644 --- a/src/unk_020677F4.c +++ b/src/unk_020677F4.c @@ -40,10 +40,10 @@ int sub_020677F4 (int param0) return 0; } -int sub_02067800 (const LocalMapObject * param0) +int sub_02067800 (const MapObject * param0) { { - UnkStruct_02067800 * v0 = sub_02062A78((LocalMapObject *)param0); + UnkStruct_02067800 * v0 = sub_02062A78((MapObject *)param0); if (v0->unk_00 == 0) { return 0xffff; @@ -51,7 +51,7 @@ int sub_02067800 (const LocalMapObject * param0) } if (sub_02062DFC(param0) == 1) { - UnkStruct_02067870 * v1 = sub_02062AF0((LocalMapObject *)param0); + UnkStruct_02067870 * v1 = sub_02062AF0((MapObject *)param0); if (v1->unk_04 != 0) { return v1->unk_00; @@ -61,13 +61,13 @@ int sub_02067800 (const LocalMapObject * param0) return 0xffff; } -void sub_02067834 (LocalMapObject * param0) +void sub_02067834 (MapObject * param0) { UnkStruct_02067800 * v0 = sub_02062A78(param0); v0->unk_02 = 1; } -void sub_02067840 (LocalMapObject * param0) +void sub_02067840 (MapObject * param0) { UnkStruct_02067800 * v0; @@ -75,7 +75,7 @@ void sub_02067840 (LocalMapObject * param0) v0->unk_00 = 0; } -void sub_02067850 (LocalMapObject * param0) +void sub_02067850 (MapObject * param0) { UnkStruct_02067800 * v0; @@ -83,12 +83,12 @@ void sub_02067850 (LocalMapObject * param0) v0->unk_00 = sub_02055F00(sub_02062C00(param0), param0); } -void sub_0206786C (LocalMapObject * param0) +void sub_0206786C (MapObject * param0) { return; } -void sub_02067870 (LocalMapObject * param0) +void sub_02067870 (MapObject * param0) { UnkStruct_02067870 * v0 = sub_02062ACC(param0, (sizeof(UnkStruct_02067870))); @@ -98,7 +98,7 @@ void sub_02067870 (LocalMapObject * param0) ov5_021F20D4(param0); } -void sub_02067890 (LocalMapObject * param0) +void sub_02067890 (MapObject * param0) { UnkStruct_02067800 * v0 = sub_02062A78(param0); UnkStruct_02067870 * v1 = sub_02062AF0(param0); @@ -146,13 +146,13 @@ void sub_02067890 (LocalMapObject * param0) } } -void sub_02067950 (LocalMapObject * param0) +void sub_02067950 (MapObject * param0) { UnkStruct_02067870 * v0 = sub_02062AF0(param0); ov5_021ECFD8(param0, &v0->unk_08, v0->unk_00); } -void sub_02067968 (LocalMapObject * param0) +void sub_02067968 (MapObject * param0) { UnkStruct_02067870 * v0 = sub_02062AF0(param0); @@ -161,10 +161,10 @@ void sub_02067968 (LocalMapObject * param0) } ov5_021ECFD8(param0, &v0->unk_08, v0->unk_00); - sub_020628BC(param0, (1 << 21)); + MapObject_SetFlagOn(param0, (1 << 21)); } -void sub_02067998 (LocalMapObject * param0) +void sub_02067998 (MapObject * param0) { UnkStruct_02067870 * v0 = sub_02062AF0(param0); @@ -176,7 +176,7 @@ void sub_02067998 (LocalMapObject * param0) if (v0->unk_00 != 0xffff) { ov5_021ECEB4(param0, &v0->unk_08, v0->unk_00); } else { - sub_020628C4(param0, (1 << 21)); + MapObject_SetFlagOff(param0, (1 << 21)); } ov5_021F20D4(param0); @@ -185,7 +185,7 @@ void sub_02067998 (LocalMapObject * param0) if (v0->unk_08 != NULL) { ov5_021ED03C(v0->unk_08, &v0->unk_0C); ov5_021EDEB4(param0, v0->unk_08); - sub_020628C4(param0, (1 << 21)); + MapObject_SetFlagOff(param0, (1 << 21)); } } @@ -221,7 +221,7 @@ static int sub_020679FC (int param0, int param1) return 0xffff; } -UnkStruct_020216E0 * sub_02067A58 (LocalMapObject * param0) +UnkStruct_020216E0 * sub_02067A58 (MapObject * param0) { UnkStruct_020216E0 * v0 = NULL; diff --git a/src/unk_02067A84.c b/src/unk_02067A84.c index 2106d698db..ac0408d04e 100644 --- a/src/unk_02067A84.c +++ b/src/unk_02067A84.c @@ -30,7 +30,7 @@ typedef struct { int unk_08; int unk_0C; int unk_10; - LocalMapObject * unk_14; + MapObject * unk_14; } UnkStruct_02067C28; typedef struct { @@ -43,25 +43,25 @@ typedef struct { int unk_18; int unk_1C; UnkStruct_ov101_021D5D90 * unk_20; - LocalMapObject * unk_24; + MapObject * unk_24; PlayerAvatar * unk_28; FieldSystem * unk_2C; } UnkStruct_020EF6D0; -static int sub_02067BA8(FieldSystem * param0, MapObjectManager * param1, PlayerAvatar * param2, const LocalMapObject * param3, UnkStruct_02067C28 * param4); -static void sub_02067C28(UnkStruct_02067C28 * param0, LocalMapObject * param1, int param2, int param3); -static int sub_02067C54(const LocalMapObject * param0); -static int sub_02067C80(const LocalMapObject * param0, PlayerAvatar * param1, int * param2); -static int sub_02067DA8(const LocalMapObject * param0, int param1, int param2, int param3, int param4, int param5); -static int sub_02067E74(const LocalMapObject * param0, int param1, int param2); -static int sub_02067F14(LocalMapObject * param0); -static LocalMapObject * sub_02067F2C(FieldSystem * param0, MapObjectManager * param1, LocalMapObject * param2, int param3); -static SysTask * sub_02067FF0(FieldSystem * param0, LocalMapObject * param1, PlayerAvatar * param2, int param3, int param4, int param5, int param6, int param7); +static int sub_02067BA8(FieldSystem * param0, MapObjectManager * param1, PlayerAvatar * param2, const MapObject * param3, UnkStruct_02067C28 * param4); +static void sub_02067C28(UnkStruct_02067C28 * param0, MapObject * param1, int param2, int param3); +static int sub_02067C54(const MapObject * param0); +static int sub_02067C80(const MapObject * param0, PlayerAvatar * param1, int * param2); +static int sub_02067DA8(const MapObject * param0, int param1, int param2, int param3, int param4, int param5); +static int sub_02067E74(const MapObject * param0, int param1, int param2); +static int sub_02067F14(MapObject * param0); +static MapObject * sub_02067F2C(FieldSystem * param0, MapObjectManager * param1, MapObject * param2, int param3); +static SysTask * sub_02067FF0(FieldSystem * param0, MapObject * param1, PlayerAvatar * param2, int param3, int param4, int param5, int param6, int param7); static int sub_02068048(SysTask * param0); static void sub_02068054(SysTask * param0); static void sub_0206806C(SysTask * param0, void * param1); -int(*const Unk_020EF6C0[])(const LocalMapObject *, int, int, int, int); +int(*const Unk_020EF6C0[])(const MapObject *, int, int, int, int); int(*const Unk_020EF6D0[])(UnkStruct_020EF6D0 *); int sub_02067A84 (FieldSystem * param0, BOOL param1) @@ -75,7 +75,7 @@ int sub_02067A84 (FieldSystem * param0, BOOL param1) } if (v0.unk_10 == 0) { - LocalMapObject * v3; + MapObject * v3; UnkStruct_02067C28 v4; sub_0203E880(param0, 3928, v0.unk_14); @@ -92,7 +92,7 @@ int sub_02067A84 (FieldSystem * param0, BOOL param1) } if (v0.unk_10 == 1) { - LocalMapObject * v5; + MapObject * v5; UnkStruct_02067C28 v6; if (param1 == 0) { @@ -113,10 +113,10 @@ int sub_02067A84 (FieldSystem * param0, BOOL param1) return 0; } -static int sub_02067BA8 (FieldSystem * param0, MapObjectManager * param1, PlayerAvatar * param2, const LocalMapObject * param3, UnkStruct_02067C28 * param4) +static int sub_02067BA8 (FieldSystem * param0, MapObjectManager * param1, PlayerAvatar * param2, const MapObject * param3, UnkStruct_02067C28 * param4) { int v0, v1, v2; - LocalMapObject * v3; + MapObject * v3; v0 = 0; v3 = NULL; @@ -138,7 +138,7 @@ static int sub_02067BA8 (FieldSystem * param0, MapObjectManager * param1, Player return 0; } -static void sub_02067C28 (UnkStruct_02067C28 * param0, LocalMapObject * param1, int param2, int param3) +static void sub_02067C28 (UnkStruct_02067C28 * param0, MapObject * param1, int param2, int param3) { param0->unk_00 = param2; param0->unk_04 = param3; @@ -148,7 +148,7 @@ static void sub_02067C28 (UnkStruct_02067C28 * param0, LocalMapObject * param1, param0->unk_14 = param1; } -static int sub_02067C54 (const LocalMapObject * param0) +static int sub_02067C54 (const MapObject * param0) { int v0 = sub_02062950(param0); @@ -165,7 +165,7 @@ static int sub_02067C54 (const LocalMapObject * param0) return v0; } -static int sub_02067C80 (const LocalMapObject * param0, PlayerAvatar * param1, int * param2) +static int sub_02067C80 (const MapObject * param0, PlayerAvatar * param1, int * param2) { int v0, v1, v2, v3, v4, v5; @@ -213,7 +213,7 @@ static int sub_02067C80 (const LocalMapObject * param0, PlayerAvatar * param1, i return(-1); } -int sub_02067D58 (const LocalMapObject * param0, PlayerAvatar * param1, int param2, int param3) +int sub_02067D58 (const MapObject * param0, PlayerAvatar * param1, int param2, int param3) { int v0 = Player_XPos(param1); int v1 = Player_ZPos(param1); @@ -228,12 +228,12 @@ int sub_02067D58 (const LocalMapObject * param0, PlayerAvatar * param1, int para return v2; } -static int sub_02067DA8 (const LocalMapObject * param0, int param1, int param2, int param3, int param4, int param5) +static int sub_02067DA8 (const MapObject * param0, int param1, int param2, int param3, int param4, int param5) { return Unk_020EF6C0[param1](param0, param2, param3, param4, param5); } -static int sub_02067DC4 (const LocalMapObject * param0, int param1, int param2, int param3, int param4) +static int sub_02067DC4 (const MapObject * param0, int param1, int param2, int param3, int param4) { int v0, v1; @@ -250,7 +250,7 @@ static int sub_02067DC4 (const LocalMapObject * param0, int param1, int param2, return(-1); } -static int sub_02067DF0 (const LocalMapObject * param0, int param1, int param2, int param3, int param4) +static int sub_02067DF0 (const MapObject * param0, int param1, int param2, int param3, int param4) { int v0, v1; @@ -267,7 +267,7 @@ static int sub_02067DF0 (const LocalMapObject * param0, int param1, int param2, return(-1); } -static int sub_02067E1C (const LocalMapObject * param0, int param1, int param2, int param3, int param4) +static int sub_02067E1C (const MapObject * param0, int param1, int param2, int param3, int param4) { int v0, v1; @@ -284,7 +284,7 @@ static int sub_02067E1C (const LocalMapObject * param0, int param1, int param2, return(-1); } -static int sub_02067E48 (const LocalMapObject * param0, int param1, int param2, int param3, int param4) +static int sub_02067E48 (const MapObject * param0, int param1, int param2, int param3, int param4) { int v0, v1; @@ -301,14 +301,14 @@ static int sub_02067E48 (const LocalMapObject * param0, int param1, int param2, return(-1); } -static int(*const Unk_020EF6C0[])(const LocalMapObject *, int, int, int, int) = { +static int(*const Unk_020EF6C0[])(const MapObject *, int, int, int, int) = { sub_02067DC4, sub_02067DF0, sub_02067E1C, sub_02067E48 }; -static int sub_02067E74 (const LocalMapObject * param0, int param1, int param2) +static int sub_02067E74 (const MapObject * param0, int param1, int param2) { int v0, v1, v2, v3; u32 v4; @@ -345,7 +345,7 @@ static int sub_02067E74 (const LocalMapObject * param0, int param1, int param2) return 1; } -static int sub_02067F14 (LocalMapObject * param0) +static int sub_02067F14 (MapObject * param0) { int v0; @@ -353,15 +353,15 @@ static int sub_02067F14 (LocalMapObject * param0) return sub_0203F254(v0); } -int sub_02067F24 (LocalMapObject * param0) +int sub_02067F24 (MapObject * param0) { return sub_02067F14(param0); } -static LocalMapObject * sub_02067F2C (FieldSystem * param0, MapObjectManager * param1, LocalMapObject * param2, int param3) +static MapObject * sub_02067F2C (FieldSystem * param0, MapObjectManager * param1, MapObject * param2, int param3) { int v0; - LocalMapObject * v1; + MapObject * v1; v0 = 0; @@ -381,7 +381,7 @@ static LocalMapObject * sub_02067F2C (FieldSystem * param0, MapObjectManager * p return NULL; } -int sub_02067F88 (FieldSystem * param0, LocalMapObject * param1) +int sub_02067F88 (FieldSystem * param0, MapObject * param1) { int v0 = sub_02067C54(param1); @@ -394,7 +394,7 @@ int sub_02067F88 (FieldSystem * param0, LocalMapObject * param1) return 0; } -SysTask * sub_02067FB8 (FieldSystem * param0, LocalMapObject * param1, PlayerAvatar * param2, int param3, int param4, int param5, int param6, int param7) +SysTask * sub_02067FB8 (FieldSystem * param0, MapObject * param1, PlayerAvatar * param2, int param3, int param4, int param5, int param6, int param7) { return sub_02067FF0(param0, param1, param2, param3, param4, param5, param6, param7); } @@ -410,7 +410,7 @@ void sub_02067FE8 (SysTask * param0) sub_02068054(param0); } -static SysTask * sub_02067FF0 (FieldSystem * param0, LocalMapObject * param1, PlayerAvatar * param2, int param3, int param4, int param5, int param6, int param7) +static SysTask * sub_02067FF0 (FieldSystem * param0, MapObject * param1, PlayerAvatar * param2, int param3, int param4, int param5, int param6, int param7) { SysTask * v0; UnkStruct_020EF6D0 * v1; @@ -466,7 +466,7 @@ static void sub_0206806C (SysTask * param0, void * param1) static int sub_02068088 (UnkStruct_020EF6D0 * param0) { - LocalMapObject * v0 = param0->unk_24; + MapObject * v0 = param0->unk_24; if (sub_02062D1C(v0) == 1) { sub_02062DDC(v0); @@ -478,14 +478,14 @@ static int sub_02068088 (UnkStruct_020EF6D0 * param0) static int sub_020680A4 (UnkStruct_020EF6D0 * param0) { - LocalMapObject * v0 = param0->unk_24; + MapObject * v0 = param0->unk_24; if (sub_02062D1C(v0) == 1) { return 0; } ov5_021ECDFC(param0->unk_24, param0->unk_08); - sub_020628BC(v0, (1 << 6)); + MapObject_SetFlagOn(v0, (1 << 6)); param0->unk_00 = 2; return 1; @@ -493,7 +493,7 @@ static int sub_020680A4 (UnkStruct_020EF6D0 * param0) static int sub_020680D0 (UnkStruct_020EF6D0 * param0) { - LocalMapObject * v0 = Player_LocalMapObject(param0->unk_28); + MapObject * v0 = Player_MapObject(param0->unk_28); if (LocalMapObj_CheckAnimationFinished(v0) == 0) { return 0; @@ -643,14 +643,14 @@ static int sub_02068248 (UnkStruct_020EF6D0 * param0) static int sub_02068264 (UnkStruct_020EF6D0 * param0) { int v0, v1; - LocalMapObject * v2; + MapObject * v2; - v2 = Player_LocalMapObject(param0->unk_28); + v2 = Player_MapObject(param0->unk_28); v1 = sub_02064488(sub_02063020(v2), sub_02063040(v2), sub_02063020(param0->unk_24), sub_02063040(param0->unk_24)); if ((Player_Dir(param0->unk_28) != v1) && ((param0->unk_18 == 0) || (param0->unk_14 == 2))) { if (LocalMapObj_IsAnimationSet(v2) == 1) { - sub_020628C4(v2, (1 << 7)); + MapObject_SetFlagOff(v2, (1 << 7)); v0 = sub_02065838(v1, 0x0); LocalMapObj_SetAnimationCode(v2, v0); param0->unk_00 = 15; @@ -664,9 +664,9 @@ static int sub_02068264 (UnkStruct_020EF6D0 * param0) static int sub_020682E0 (UnkStruct_020EF6D0 * param0) { - LocalMapObject * v0; + MapObject * v0; - v0 = Player_LocalMapObject(param0->unk_28); + v0 = Player_MapObject(param0->unk_28); if (LocalMapObj_CheckAnimationFinished(v0) == 0) { return 0; diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c index b410bf1e6b..5792beb381 100644 --- a/src/unk_020683F4.c +++ b/src/unk_020683F4.c @@ -209,7 +209,7 @@ u32 sub_020683F4 (u16 param0, u16 param1) void sub_0206842C (FieldSystem * param0, UnkStruct_020684D0 * param1) { int v0, v1, v2; - LocalMapObject * v3; + MapObject * v3; if (sub_0205F158(param0->playerAvatar) == 1) { sub_020684D0(param0, param1); @@ -308,7 +308,7 @@ static BOOL sub_020685AC (TaskManager * param0) FieldSystem * v0 = TaskManager_FieldSystem(param0); UnkStruct_0206851C * v1 = TaskManager_Environment(param0); int * v2 = sub_02050A68(param0); - LocalMapObject * v3; + MapObject * v3; switch (*v2) { case 0: @@ -489,7 +489,7 @@ static BOOL sub_02068884 (TaskManager * param0) break; case 1: if (sub_0205EB74(v0->playerAvatar) == 0x1) { - sub_02062DDC(Player_LocalMapObject(v0->playerAvatar)); + sub_02062DDC(Player_MapObject(v0->playerAvatar)); ov5_021DFB54(v0->playerAvatar, (1 << 0)); ov5_021DFB5C(v0->playerAvatar); @@ -499,7 +499,7 @@ static BOOL sub_02068884 (TaskManager * param0) } else { sub_020553F0(v0, 1152); sub_02055554(v0, 1152, 1); - sub_02062DDC(Player_LocalMapObject(v0->playerAvatar)); + sub_02062DDC(Player_MapObject(v0->playerAvatar)); ov5_021DFB54(v0->playerAvatar, (1 << 1)); ov5_021DFB5C(v0->playerAvatar); @@ -537,7 +537,7 @@ static u32 sub_02068948 (const UnkStruct_020684D0 * param0) } { - LocalMapObject * v1 = Player_LocalMapObject(param0->unk_14); + MapObject * v1 = Player_MapObject(param0->unk_14); if ((sub_0206415C(v1, param0->unk_0E) == 1) || (sub_0206417C(v1, param0->unk_0E) == 1)) { return 1; @@ -637,7 +637,7 @@ static void sub_02068B1C (UnkStruct_02068630 * param0, const UnkStruct_020684D0 { FieldSystem * v0; FieldMenu * v1; - LocalMapObject * v2; + MapObject * v2; v0 = TaskManager_FieldSystem(param0->unk_00); v1 = TaskManager_Environment(param0->unk_00); @@ -916,7 +916,7 @@ static u32 sub_02068E94 (const UnkStruct_020684D0 * param0) if (sub_0205DB58(param0->unk_0C) == 1) { if ((sub_0205DEFC(param0->unk_0E) == 1) || (sub_0205DEF0(param0->unk_0E) == 1)) { - LocalMapObject * v0 = Player_LocalMapObject(param0->unk_14); + MapObject * v0 = Player_MapObject(param0->unk_14); if (sub_02062F30(v0) == 1) { return -1; diff --git a/src/unk_02069BE0.c b/src/unk_02069BE0.c index 670c53bd3f..d5fddbee21 100644 --- a/src/unk_02069BE0.c +++ b/src/unk_02069BE0.c @@ -33,7 +33,7 @@ typedef struct { s16 unk_02; s16 unk_04; u16 unk_06; - LocalMapObject * unk_08; + MapObject * unk_08; } UnkStruct_02069F48; typedef struct { @@ -57,23 +57,23 @@ typedef struct { int unk_08; } UnkStruct_0206A47C; -static int sub_02069CA8(LocalMapObject * param0, UnkStruct_02069CA8 * param1); -static void sub_02069CD4(LocalMapObject * param0, UnkStruct_02069CA8 * param1); -static int sub_02069CFC(LocalMapObject * param0, UnkStruct_02069CA8 * param1); -static void sub_02069D30(LocalMapObject * param0, UnkStruct_02069CA8 * param1); -static u32 sub_02069D50(LocalMapObject * param0); -static int sub_02069D8C(LocalMapObject * param0); -static int sub_02069F48(LocalMapObject * param0, UnkStruct_02069F48 * param1); -static void sub_02069FC4(LocalMapObject * param0, UnkStruct_02069F48 * param1, LocalMapObject * param2); -static int sub_02069FE8(LocalMapObject * param0, UnkStruct_02069F48 * param1); -static int sub_0206A034(LocalMapObject * param0, UnkStruct_02069F48 * param1); -static int sub_0206A630(LocalMapObject * param0, UnkStruct_0206A47C * param1, int param2); +static int sub_02069CA8(MapObject * param0, UnkStruct_02069CA8 * param1); +static void sub_02069CD4(MapObject * param0, UnkStruct_02069CA8 * param1); +static int sub_02069CFC(MapObject * param0, UnkStruct_02069CA8 * param1); +static void sub_02069D30(MapObject * param0, UnkStruct_02069CA8 * param1); +static u32 sub_02069D50(MapObject * param0); +static int sub_02069D8C(MapObject * param0); +static int sub_02069F48(MapObject * param0, UnkStruct_02069F48 * param1); +static void sub_02069FC4(MapObject * param0, UnkStruct_02069F48 * param1, MapObject * param2); +static int sub_02069FE8(MapObject * param0, UnkStruct_02069F48 * param1); +static int sub_0206A034(MapObject * param0, UnkStruct_02069F48 * param1); +static int sub_0206A630(MapObject * param0, UnkStruct_0206A47C * param1, int param2); -int(*const Unk_020EF8D4[])(LocalMapObject *, UnkStruct_02069CA8 *); -int(*const Unk_020EF8EC[])(LocalMapObject *, UnkStruct_02069F48 *); -int(*const Unk_020EF8DC[])(LocalMapObject *, UnkStruct_0206A0BC *); +int(*const Unk_020EF8D4[])(MapObject *, UnkStruct_02069CA8 *); +int(*const Unk_020EF8EC[])(MapObject *, UnkStruct_02069F48 *); +int(*const Unk_020EF8DC[])(MapObject *, UnkStruct_0206A0BC *); -void sub_02069BE0 (LocalMapObject * param0) +void sub_02069BE0 (MapObject * param0) { UnkStruct_02069CA8 * v0 = sub_02062A54(param0, (sizeof(UnkStruct_02069CA8))); @@ -83,7 +83,7 @@ void sub_02069BE0 (LocalMapObject * param0) sub_02062D80(param0, 0); } -void sub_02069C0C (LocalMapObject * param0) +void sub_02069C0C (MapObject * param0) { UnkStruct_02069CA8 * v0 = sub_02062A78(param0); @@ -98,12 +98,12 @@ void sub_02069C0C (LocalMapObject * param0) } } -void sub_02069C44 (LocalMapObject * param0) +void sub_02069C44 (MapObject * param0) { return; } -static int sub_02069C48 (LocalMapObject * param0, UnkStruct_02069CA8 * param1) +static int sub_02069C48 (MapObject * param0, UnkStruct_02069CA8 * param1) { sub_02062D10(param0); sub_02062D34(param0); @@ -121,7 +121,7 @@ static int sub_02069C48 (LocalMapObject * param0, UnkStruct_02069CA8 * param1) return 0; } -static int sub_02069C8C (LocalMapObject * param0, UnkStruct_02069CA8 * param1) +static int sub_02069C8C (MapObject * param0, UnkStruct_02069CA8 * param1) { if (sub_020658DC(param0) == 1) { sub_02062D10(param0); @@ -131,15 +131,15 @@ static int sub_02069C8C (LocalMapObject * param0, UnkStruct_02069CA8 * param1) return 0; } -static int(*const Unk_020EF8D4[])(LocalMapObject *, UnkStruct_02069CA8 *) = { +static int(*const Unk_020EF8D4[])(MapObject *, UnkStruct_02069CA8 *) = { sub_02069C48, sub_02069C8C }; -static int sub_02069CA8 (LocalMapObject * param0, UnkStruct_02069CA8 * param1) +static int sub_02069CA8 (MapObject * param0, UnkStruct_02069CA8 * param1) { const MapObjectManager * v0 = sub_02062A40(param0); - LocalMapObject * v1 = sub_0205EA24(v0); + MapObject * v1 = sub_0205EA24(v0); if (v1 == NULL) { param1->unk_01 = 0; @@ -153,7 +153,7 @@ static int sub_02069CA8 (LocalMapObject * param0, UnkStruct_02069CA8 * param1) return 1; } -static void sub_02069CD4 (LocalMapObject * param0, UnkStruct_02069CA8 * param1) +static void sub_02069CD4 (MapObject * param0, UnkStruct_02069CA8 * param1) { FieldSystem * v0 = sub_02062C00(param0); PlayerAvatar * v1 = sub_0205EF3C(v0); @@ -164,7 +164,7 @@ static void sub_02069CD4 (LocalMapObject * param0, UnkStruct_02069CA8 * param1) param1->unk_06 = 0xff; } -static int sub_02069CFC (LocalMapObject * param0, UnkStruct_02069CA8 * param1) +static int sub_02069CFC (MapObject * param0, UnkStruct_02069CA8 * param1) { FieldSystem * v0 = sub_02062C00(param0); PlayerAvatar * v1 = sub_0205EF3C(v0); @@ -181,7 +181,7 @@ static int sub_02069CFC (LocalMapObject * param0, UnkStruct_02069CA8 * param1) return 0; } -static void sub_02069D30 (LocalMapObject * param0, UnkStruct_02069CA8 * param1) +static void sub_02069D30 (MapObject * param0, UnkStruct_02069CA8 * param1) { FieldSystem * v0 = sub_02062C00(param0); PlayerAvatar * v1 = sub_0205EF3C(v0); @@ -190,7 +190,7 @@ static void sub_02069D30 (LocalMapObject * param0, UnkStruct_02069CA8 * param1) param1->unk_04 = Player_ZPos(v1); } -static u32 sub_02069D50 (LocalMapObject * param0) +static u32 sub_02069D50 (MapObject * param0) { u32 v0; FieldSystem * v1 = sub_02062C00(param0); @@ -216,7 +216,7 @@ static u32 sub_02069D50 (LocalMapObject * param0) return v0; } -static int sub_02069D8C (LocalMapObject * param0) +static int sub_02069D8C (MapObject * param0) { FieldSystem * v0 = sub_02062C00(param0); PlayerAvatar * v1 = sub_0205EF3C(v0); @@ -238,7 +238,7 @@ static int sub_02069D8C (LocalMapObject * param0) return 0; } -void sub_02069DF4 (LocalMapObject * param0) +void sub_02069DF4 (MapObject * param0) { UnkStruct_02069F48 * v0 = sub_02062A54(param0, (sizeof(UnkStruct_02069F48))); @@ -249,7 +249,7 @@ void sub_02069DF4 (LocalMapObject * param0) v0->unk_01 = 0; } -void sub_02069E1C (LocalMapObject * param0) +void sub_02069E1C (MapObject * param0) { UnkStruct_02069F48 * v0 = sub_02062A78(param0); @@ -262,18 +262,18 @@ void sub_02069E1C (LocalMapObject * param0) } } -void sub_02069E4C (LocalMapObject * param0) +void sub_02069E4C (MapObject * param0) { return; } -void sub_02069E50 (LocalMapObject * param0) +void sub_02069E50 (MapObject * param0) { UnkStruct_02069F48 * v0 = sub_02062A78(param0); v0->unk_01 = 0; } -static int sub_02069E5C (LocalMapObject * param0, UnkStruct_02069F48 * param1) +static int sub_02069E5C (MapObject * param0, UnkStruct_02069F48 * param1) { sub_02062D10(param0); sub_02062D34(param0); @@ -289,7 +289,7 @@ static int sub_02069E5C (LocalMapObject * param0, UnkStruct_02069F48 * param1) return 0; } -static int sub_02069E98 (LocalMapObject * param0, UnkStruct_02069F48 * param1) +static int sub_02069E98 (MapObject * param0, UnkStruct_02069F48 * param1) { if (sub_020658DC(param0) == 0) { return 0; @@ -300,19 +300,19 @@ static int sub_02069E98 (LocalMapObject * param0, UnkStruct_02069F48 * param1) return 0; } -static int(*const Unk_020EF8EC[])(LocalMapObject *, UnkStruct_02069F48 *) = { +static int(*const Unk_020EF8EC[])(MapObject *, UnkStruct_02069F48 *) = { sub_02069E5C, sub_02069E98 }; -LocalMapObject * sub_02069EB8 (LocalMapObject * param0) +MapObject * sub_02069EB8 (MapObject * param0) { int v0 = 0; int v1 = sub_02062950(param0); int v2 = sub_02062918(param0); u32 v3 = sub_02067F24(param0); const MapObjectManager * v4 = sub_02062A40(param0); - LocalMapObject * v5; + MapObject * v5; switch (v1) { case 0x1: @@ -335,11 +335,11 @@ LocalMapObject * sub_02069EB8 (LocalMapObject * param0) return NULL; } -static int sub_02069F48 (LocalMapObject * param0, UnkStruct_02069F48 * param1) +static int sub_02069F48 (MapObject * param0, UnkStruct_02069F48 * param1) { int v0, v1; u32 v2; - LocalMapObject * v3; + MapObject * v3; const MapObjectManager * v4 = sub_02062A40(param0); v0 = 0; @@ -360,7 +360,7 @@ static int sub_02069F48 (LocalMapObject * param0, UnkStruct_02069F48 * param1) return 0; } -static void sub_02069FC4 (LocalMapObject * param0, UnkStruct_02069F48 * param1, LocalMapObject * param2) +static void sub_02069FC4 (MapObject * param0, UnkStruct_02069F48 * param1, MapObject * param2) { param1->unk_01 = 1; param1->unk_02 = sub_02063020(param2); @@ -369,9 +369,9 @@ static void sub_02069FC4 (LocalMapObject * param0, UnkStruct_02069F48 * param1, param1->unk_08 = param2; } -static int sub_02069FE8 (LocalMapObject * param0, UnkStruct_02069F48 * param1) +static int sub_02069FE8 (MapObject * param0, UnkStruct_02069F48 * param1) { - LocalMapObject * v0 = param1->unk_08; + MapObject * v0 = param1->unk_08; int v1 = sub_02063020(param0); int v2 = sub_02063040(param0); int v3 = sub_02063008(v0); @@ -384,7 +384,7 @@ static int sub_02069FE8 (LocalMapObject * param0, UnkStruct_02069F48 * param1) return 0; } -static int sub_0206A034 (LocalMapObject * param0, UnkStruct_02069F48 * param1) +static int sub_0206A034 (MapObject * param0, UnkStruct_02069F48 * param1) { int v0 = sub_02063020(param0); int v1 = sub_02063040(param0); @@ -413,7 +413,7 @@ static int sub_0206A034 (LocalMapObject * param0, UnkStruct_02069F48 * param1) return 0; } -static void sub_0206A0BC (LocalMapObject * param0, int param1) +static void sub_0206A0BC (MapObject * param0, int param1) { UnkStruct_0206A0BC * v0 = sub_02062A54(param0, (sizeof(UnkStruct_0206A0BC))); @@ -421,7 +421,7 @@ static void sub_0206A0BC (LocalMapObject * param0, int param1) sub_02062A0C(param0, 0x0); sub_02062D10(param0); - sub_020628BC(param0, (1 << 20)); + MapObject_SetFlagOn(param0, (1 << 20)); { VecFx32 v1 = {0, (FX32_ONE * -32), 0}; @@ -430,27 +430,27 @@ static void sub_0206A0BC (LocalMapObject * param0, int param1) } } -void sub_0206A104 (LocalMapObject * param0) +void sub_0206A104 (MapObject * param0) { sub_0206A0BC(param0, 0); } -void sub_0206A110 (LocalMapObject * param0) +void sub_0206A110 (MapObject * param0) { sub_0206A0BC(param0, 1); } -void sub_0206A11C (LocalMapObject * param0) +void sub_0206A11C (MapObject * param0) { sub_0206A0BC(param0, 2); } -void sub_0206A128 (LocalMapObject * param0) +void sub_0206A128 (MapObject * param0) { sub_0206A0BC(param0, 3); } -void sub_0206A134 (LocalMapObject * param0) +void sub_0206A134 (MapObject * param0) { UnkStruct_0206A0BC * v0 = sub_02062A78(param0); @@ -459,7 +459,7 @@ void sub_0206A134 (LocalMapObject * param0) } } -void sub_0206A158 (LocalMapObject * param0) +void sub_0206A158 (MapObject * param0) { UnkStruct_ov101_021D5D90 * v0 = sub_0206A224(param0); @@ -468,7 +468,7 @@ void sub_0206A158 (LocalMapObject * param0) } } -void sub_0206A168 (LocalMapObject * param0) +void sub_0206A168 (MapObject * param0) { UnkStruct_0206A0BC * v0 = sub_02062A78(param0); @@ -479,11 +479,11 @@ void sub_0206A168 (LocalMapObject * param0) VecFx32 v1 = {0, (FX32_ONE * -32), 0}; sub_02063088(param0, &v1); - sub_020628BC(param0, (1 << 20)); + MapObject_SetFlagOn(param0, (1 << 20)); } } -static int sub_0206A1AC (LocalMapObject * param0, UnkStruct_0206A0BC * param1) +static int sub_0206A1AC (MapObject * param0, UnkStruct_0206A0BC * param1) { if (param1->unk_02 == 0) { UnkStruct_ov101_021D5D90 * v0 = ov5_021F3D90(param0, param1->unk_01); @@ -498,7 +498,7 @@ static int sub_0206A1AC (LocalMapObject * param0, UnkStruct_0206A0BC * param1) return 0; } -static int sub_0206A1DC (LocalMapObject * param0, UnkStruct_0206A0BC * param1) +static int sub_0206A1DC (MapObject * param0, UnkStruct_0206A0BC * param1) { if (param1->unk_02 == 0) { UnkStruct_ov101_021D5D90 * v0 = sub_0206A224(param0); @@ -510,38 +510,38 @@ static int sub_0206A1DC (LocalMapObject * param0, UnkStruct_0206A0BC * param1) } } - sub_020628BC(param0, (1 << 20)); + MapObject_SetFlagOn(param0, (1 << 20)); } return 0; } -static int(*const Unk_020EF8DC[])(LocalMapObject *, UnkStruct_0206A0BC *) = { +static int(*const Unk_020EF8DC[])(MapObject *, UnkStruct_0206A0BC *) = { sub_0206A1AC, sub_0206A1DC }; -void sub_0206A218 (LocalMapObject * param0, UnkStruct_ov101_021D5D90 * param1) +void sub_0206A218 (MapObject * param0, UnkStruct_ov101_021D5D90 * param1) { UnkStruct_0206A0BC * v0 = sub_02062A78(param0); v0->unk_04 = param1; } -UnkStruct_ov101_021D5D90 * sub_0206A224 (LocalMapObject * param0) +UnkStruct_ov101_021D5D90 * sub_0206A224 (MapObject * param0) { UnkStruct_0206A0BC * v0 = sub_02062A78(param0); return v0->unk_04; } -void sub_0206A230 (LocalMapObject * param0) +void sub_0206A230 (MapObject * param0) { UnkStruct_0206A0BC * v0 = sub_02062A78(param0); v0->unk_02 = 1; } -static int(*const Unk_020EF918[5])(LocalMapObject *, UnkStruct_0206A23C *); +static int(*const Unk_020EF918[5])(MapObject *, UnkStruct_0206A23C *); -static void sub_0206A23C (LocalMapObject * param0, int param1, u32 param2) +static void sub_0206A23C (MapObject * param0, int param1, u32 param2) { UnkStruct_0206A23C * v0 = sub_02062A54(param0, (sizeof(UnkStruct_0206A23C))); @@ -551,47 +551,47 @@ static void sub_0206A23C (LocalMapObject * param0, int param1, u32 param2) sub_02062974(param0, 0); } -void sub_0206A25C (LocalMapObject * param0) +void sub_0206A25C (MapObject * param0) { sub_0206A23C(param0, 0, 0); } -void sub_0206A268 (LocalMapObject * param0) +void sub_0206A268 (MapObject * param0) { sub_0206A23C(param0, 1, 0); } -void sub_0206A274 (LocalMapObject * param0) +void sub_0206A274 (MapObject * param0) { sub_0206A23C(param0, 2, 0); } -void sub_0206A280 (LocalMapObject * param0) +void sub_0206A280 (MapObject * param0) { sub_0206A23C(param0, 3, 0); } -void sub_0206A28C (LocalMapObject * param0) +void sub_0206A28C (MapObject * param0) { sub_0206A23C(param0, 0, 1); } -void sub_0206A298 (LocalMapObject * param0) +void sub_0206A298 (MapObject * param0) { sub_0206A23C(param0, 1, 1); } -void sub_0206A2A4 (LocalMapObject * param0) +void sub_0206A2A4 (MapObject * param0) { sub_0206A23C(param0, 2, 1); } -void sub_0206A2B0 (LocalMapObject * param0) +void sub_0206A2B0 (MapObject * param0) { sub_0206A23C(param0, 3, 1); } -void sub_0206A2BC (LocalMapObject * param0) +void sub_0206A2BC (MapObject * param0) { UnkStruct_0206A23C * v0 = sub_02062A78(param0); @@ -600,7 +600,7 @@ void sub_0206A2BC (LocalMapObject * param0) } } -static int sub_0206A2E0 (LocalMapObject * param0, UnkStruct_0206A23C * param1) +static int sub_0206A2E0 (MapObject * param0, UnkStruct_0206A23C * param1) { int v0 = sub_0206298C(param0); @@ -614,7 +614,7 @@ static int sub_0206A2E0 (LocalMapObject * param0, UnkStruct_0206A23C * param1) return 1; } -static int sub_0206A30C (LocalMapObject * param0, UnkStruct_0206A23C * param1) +static int sub_0206A30C (MapObject * param0, UnkStruct_0206A23C * param1) { if (sub_020658DC(param0) == 1) { param1->unk_00 = 2; @@ -624,7 +624,7 @@ static int sub_0206A30C (LocalMapObject * param0, UnkStruct_0206A23C * param1) return 0; } -static int sub_0206A324 (LocalMapObject * param0, UnkStruct_0206A23C * param1) +static int sub_0206A324 (MapObject * param0, UnkStruct_0206A23C * param1) { if (param1->unk_01 == -1) { FieldSystem * v0 = sub_02062C00(param0); @@ -639,7 +639,7 @@ static int sub_0206A324 (LocalMapObject * param0, UnkStruct_0206A23C * param1) return 1; } -static u32 sub_0206A354 (LocalMapObject * param0, int param1) +static u32 sub_0206A354 (MapObject * param0, int param1) { u32 v0 = sub_02064238(param0, param1); @@ -651,7 +651,7 @@ static u32 sub_0206A354 (LocalMapObject * param0, int param1) return v0; } -static void sub_0206A37C (LocalMapObject * param0, int param1, int param2, u32 param3) +static void sub_0206A37C (MapObject * param0, int param1, int param2, u32 param3) { u32 v0; @@ -671,7 +671,7 @@ static void sub_0206A37C (LocalMapObject * param0, int param1, int param2, u32 p sub_02065668(param0, param2); } -static int sub_0206A3BC (LocalMapObject * param0, UnkStruct_0206A23C * param1) +static int sub_0206A3BC (MapObject * param0, UnkStruct_0206A23C * param1) { int v0; FieldSystem * v1 = sub_02062C00(param0); @@ -705,7 +705,7 @@ static int sub_0206A3BC (LocalMapObject * param0, UnkStruct_0206A23C * param1) return 1; } -static int sub_0206A454 (LocalMapObject * param0, UnkStruct_0206A23C * param1) +static int sub_0206A454 (MapObject * param0, UnkStruct_0206A23C * param1) { if (sub_020658DC(param0) == 0) { return 0; @@ -718,7 +718,7 @@ static int sub_0206A454 (LocalMapObject * param0, UnkStruct_0206A23C * param1) return 0; } -static int(*const Unk_020EF918[5])(LocalMapObject *, UnkStruct_0206A23C *) = { +static int(*const Unk_020EF918[5])(MapObject *, UnkStruct_0206A23C *) = { sub_0206A2E0, sub_0206A30C, sub_0206A324, @@ -726,9 +726,9 @@ static int(*const Unk_020EF918[5])(LocalMapObject *, UnkStruct_0206A23C *) = { sub_0206A454 }; -static int(*const Unk_020EF90C[3])(LocalMapObject *, UnkStruct_0206A47C *); +static int(*const Unk_020EF90C[3])(MapObject *, UnkStruct_0206A47C *); -static void sub_0206A47C (LocalMapObject * param0, int param1, int param2) +static void sub_0206A47C (MapObject * param0, int param1, int param2) { UnkStruct_0206A47C * v0 = sub_02062A54(param0, (sizeof(UnkStruct_0206A47C))); @@ -736,27 +736,27 @@ static void sub_0206A47C (LocalMapObject * param0, int param1, int param2) v0->unk_08 = param2; } -void sub_0206A490 (LocalMapObject * param0) +void sub_0206A490 (MapObject * param0) { sub_0206A47C(param0, 0, 0); } -void sub_0206A49C (LocalMapObject * param0) +void sub_0206A49C (MapObject * param0) { sub_0206A47C(param0, 1, 1); } -void sub_0206A4A8 (LocalMapObject * param0) +void sub_0206A4A8 (MapObject * param0) { sub_0206A47C(param0, 2, 0); } -void sub_0206A4B4 (LocalMapObject * param0) +void sub_0206A4B4 (MapObject * param0) { sub_0206A47C(param0, 2, 1); } -void sub_0206A4C0 (LocalMapObject * param0) +void sub_0206A4C0 (MapObject * param0) { UnkStruct_0206A47C * v0 = sub_02062A78(param0); @@ -765,21 +765,21 @@ void sub_0206A4C0 (LocalMapObject * param0) } } -static int sub_0206A4E4 (LocalMapObject * param0, UnkStruct_0206A47C * param1) +static int sub_0206A4E4 (MapObject * param0, UnkStruct_0206A47C * param1) { sub_02062D10(param0); param1->unk_00++; return 1; } -static int sub_0206A4F8 (LocalMapObject * param0, UnkStruct_0206A47C * param1) +static int sub_0206A4F8 (MapObject * param0, UnkStruct_0206A47C * param1) { sub_0206A630(param0, param1, 0xc); param1->unk_00++; return 1; } -static int sub_0206A50C (LocalMapObject * param0, UnkStruct_0206A47C * param1) +static int sub_0206A50C (MapObject * param0, UnkStruct_0206A47C * param1) { if (sub_020658DC(param0) == 1) { param1->unk_00 = 0; @@ -789,7 +789,7 @@ static int sub_0206A50C (LocalMapObject * param0, UnkStruct_0206A47C * param1) return 0; } -static int(*const Unk_020EF90C[3])(LocalMapObject *, UnkStruct_0206A47C *) = { +static int(*const Unk_020EF90C[3])(MapObject *, UnkStruct_0206A47C *) = { sub_0206A4E4, sub_0206A4F8, sub_0206A50C @@ -864,7 +864,7 @@ static BOOL sub_0206A54C (FieldSystem * param0, int param1, int param2, int para return v0; } -static int sub_0206A574 (LocalMapObject * param0, int param1, int param2) +static int sub_0206A574 (MapObject * param0, int param1, int param2) { FieldSystem * v0 = sub_02062C00(param0); int v1 = sub_02063020(param0); @@ -874,7 +874,7 @@ static int sub_0206A574 (LocalMapObject * param0, int param1, int param2) return v3; } -static int sub_0206A5A4 (LocalMapObject * param0, int param1, int param2) +static int sub_0206A5A4 (MapObject * param0, int param1, int param2) { FieldSystem * v0 = sub_02062C00(param0); int v1 = sub_02063020(param0); @@ -884,7 +884,7 @@ static int sub_0206A5A4 (LocalMapObject * param0, int param1, int param2) return v3; } -static int sub_0206A5D4 (LocalMapObject * param0, int param1, int param2) +static int sub_0206A5D4 (MapObject * param0, int param1, int param2) { if (sub_0206A574(param0, param1, param2) == 0) { if (sub_0206A5A4(param0, param1, param2) == 0) { @@ -897,7 +897,7 @@ static int sub_0206A5D4 (LocalMapObject * param0, int param1, int param2) return param1; } -static u32 sub_0206A60C (LocalMapObject * param0, int * param1, int param2) +static u32 sub_0206A60C (MapObject * param0, int * param1, int param2) { u32 v0; @@ -911,7 +911,7 @@ static u32 sub_0206A60C (LocalMapObject * param0, int * param1, int param2) return 0; } -static int sub_0206A630 (LocalMapObject * param0, UnkStruct_0206A47C * param1, int param2) +static int sub_0206A630 (MapObject * param0, UnkStruct_0206A47C * param1, int param2) { u32 v0; int v1 = param1->unk_08; diff --git a/src/unk_0206C0E8.c b/src/unk_0206C0E8.c index 78d78d8f7f..0c1c8484f9 100644 --- a/src/unk_0206C0E8.c +++ b/src/unk_0206C0E8.c @@ -88,7 +88,7 @@ static BOOL sub_0206C120 (TaskManager * param0) break; case 4: { - LocalMapObject * v3 = Player_LocalMapObject(v0->playerAvatar); + MapObject * v3 = Player_MapObject(v0->playerAvatar); v1->unk_0D++; diff --git a/src/unk_0207070C.c b/src/unk_0207070C.c index ddc468ba17..e871cefeb1 100644 --- a/src/unk_0207070C.c +++ b/src/unk_0207070C.c @@ -48,7 +48,7 @@ typedef struct { typedef struct { u32 unk_00; - LocalMapObject * unk_04; + MapObject * unk_04; UnkStruct_020709CC unk_08; } UnkStruct_0207086C; @@ -164,7 +164,7 @@ u32 sub_0207070C (u16 param0, u16 param1) void sub_02070728 (FieldSystem * param0, UnkStruct_02070950 * param1) { - LocalMapObject * v0; + MapObject * v0; int v1, v2; int v3; int v4; diff --git a/src/unk_020EDBAC.c b/src/unk_020EDBAC.c index d23abf85b1..11ea95af6e 100644 --- a/src/unk_020EDBAC.c +++ b/src/unk_020EDBAC.c @@ -15,160 +15,160 @@ #include "unk_020677F4.h" #include "unk_02069BE0.h" -extern int (*const Unk_020EEC78[])(LocalMapObject *); -extern int (*const Unk_020EEC48[])(LocalMapObject *); -extern int (*const Unk_020EEC88[])(LocalMapObject *); -extern int (*const Unk_020EEC80[])(LocalMapObject *); -extern int (*const Unk_020EF59C[])(LocalMapObject *); -extern int (*const Unk_020EF590[])(LocalMapObject *); -extern int (*const Unk_020EF584[])(LocalMapObject *); -extern int (*const Unk_020EF578[])(LocalMapObject *); -extern int (*const Unk_020EF56C[])(LocalMapObject *); -extern int (*const Unk_020EF560[])(LocalMapObject *); -extern int (*const Unk_020EF554[])(LocalMapObject *); -extern int (*const Unk_020EF548[])(LocalMapObject *); -extern int (*const Unk_020EF53C[])(LocalMapObject *); -extern int (*const Unk_020EF530[])(LocalMapObject *); -extern int (*const Unk_020EF524[])(LocalMapObject *); -extern int (*const Unk_020EF518[])(LocalMapObject *); -extern int (*const Unk_020EF50C[])(LocalMapObject *); -extern int (*const Unk_020EF500[])(LocalMapObject *); -extern int (*const Unk_020EF4F4[])(LocalMapObject *); -extern int (*const Unk_020EF4E8[])(LocalMapObject *); -extern int (*const Unk_020EF4DC[])(LocalMapObject *); -extern int (*const Unk_020EF4D0[])(LocalMapObject *); -extern int (*const Unk_020EF4C4[])(LocalMapObject *); -extern int (*const Unk_020EF4B8[])(LocalMapObject *); -extern int (*const Unk_020EF4AC[])(LocalMapObject *); -extern int (*const Unk_020EF4A0[])(LocalMapObject *); -extern int (*const Unk_020EF494[])(LocalMapObject *); -extern int (*const Unk_020EF488[])(LocalMapObject *); -extern int (*const Unk_020EF194[])(LocalMapObject *); -extern int (*const Unk_020EF224[])(LocalMapObject *); -extern int (*const Unk_020EF440[])(LocalMapObject *); -extern int (*const Unk_020EF470[])(LocalMapObject *); -extern int (*const Unk_020EF47C[])(LocalMapObject *); -extern int (*const Unk_020EF230[])(LocalMapObject *); -extern int (*const Unk_020EF458[])(LocalMapObject *); -extern int (*const Unk_020EF464[])(LocalMapObject *); -extern int (*const Unk_020EF5A8[])(LocalMapObject *); -extern int (*const Unk_020EF5B4[])(LocalMapObject *); -extern int (*const Unk_020EF434[])(LocalMapObject *); -extern int (*const Unk_020EF428[])(LocalMapObject *); -extern int (*const Unk_020EF41C[])(LocalMapObject *); -extern int (*const Unk_020EF410[])(LocalMapObject *); -extern int (*const Unk_020EF404[])(LocalMapObject *); -extern int (*const Unk_020EF3F8[])(LocalMapObject *); -extern int (*const Unk_020EF3EC[])(LocalMapObject *); -extern int (*const Unk_020EF3E0[])(LocalMapObject *); -extern int (*const Unk_020EF3D4[])(LocalMapObject *); -extern int (*const Unk_020EF3C8[])(LocalMapObject *); -extern int (*const Unk_020EF3BC[])(LocalMapObject *); -extern int (*const Unk_020EF3B0[])(LocalMapObject *); -extern int (*const Unk_020EF3A4[])(LocalMapObject *); -extern int (*const Unk_020EF398[])(LocalMapObject *); -extern int (*const Unk_020EF38C[])(LocalMapObject *); -extern int (*const Unk_020EF380[])(LocalMapObject *); -extern int (*const Unk_020EF374[])(LocalMapObject *); -extern int (*const Unk_020EF368[])(LocalMapObject *); -extern int (*const Unk_020EF35C[])(LocalMapObject *); -extern int (*const Unk_020EF350[])(LocalMapObject *); -extern int (*const Unk_020EF344[])(LocalMapObject *); -extern int (*const Unk_020EF338[])(LocalMapObject *); -extern int (*const Unk_020EF32C[])(LocalMapObject *); -extern int (*const Unk_020EF320[])(LocalMapObject *); -extern int (*const Unk_020EF314[])(LocalMapObject *); -extern int (*const Unk_020EF308[])(LocalMapObject *); -extern int (*const Unk_020EF2FC[])(LocalMapObject *); -extern int (*const Unk_020EF2F0[])(LocalMapObject *); -extern int (*const Unk_020EF2E4[])(LocalMapObject *); -extern int (*const Unk_020EF2D8[])(LocalMapObject *); -extern int (*const Unk_020EEC98[])(LocalMapObject *); -extern int (*const Unk_020EF2C0[])(LocalMapObject *); -extern int (*const Unk_020EF2B4[])(LocalMapObject *); -extern int (*const Unk_020EF2A8[])(LocalMapObject *); -extern int (*const Unk_020EF020[])(LocalMapObject *); -extern int (*const Unk_020EF17C[])(LocalMapObject *); -extern int (*const Unk_020EF1A0[])(LocalMapObject *); -extern int (*const Unk_020EF44C[])(LocalMapObject *); -extern int (*const Unk_020EF29C[])(LocalMapObject *); -extern int (*const Unk_020EF290[])(LocalMapObject *); -extern int (*const Unk_020EF284[])(LocalMapObject *); -extern int (*const Unk_020EF278[])(LocalMapObject *); -extern int (*const Unk_020EF26C[])(LocalMapObject *); -extern int (*const Unk_020EF260[])(LocalMapObject *); -extern int (*const Unk_020EF254[])(LocalMapObject *); -extern int (*const Unk_020EF248[])(LocalMapObject *); -extern int (*const Unk_020EF23C[])(LocalMapObject *); -extern int (*const Unk_020EEC70[])(LocalMapObject *); -extern int (*const Unk_020EEC68[])(LocalMapObject *); -extern int (*const Unk_020EEC50[])(LocalMapObject *); -extern int (*const Unk_020EEC90[])(LocalMapObject *); -extern int (*const Unk_020EEC58[])(LocalMapObject *); -extern int (*const Unk_020EEC60[])(LocalMapObject *); -extern int (*const Unk_020EF218[])(LocalMapObject *); -extern int (*const Unk_020EF20C[])(LocalMapObject *); -extern int (*const Unk_020EF200[])(LocalMapObject *); -extern int (*const Unk_020EF1F4[])(LocalMapObject *); -extern int (*const Unk_020EF1E8[])(LocalMapObject *); -extern int (*const Unk_020EF1DC[])(LocalMapObject *); -extern int (*const Unk_020EF1D0[])(LocalMapObject *); -extern int (*const Unk_020EF1C4[])(LocalMapObject *); -extern int (*const Unk_020EF1B8[])(LocalMapObject *); -extern int (*const Unk_020EF188[])(LocalMapObject *); -extern int (*const Unk_020EF5C0[])(LocalMapObject *); -extern int (*const Unk_020EF164[])(LocalMapObject *); -extern int (*const Unk_020EF158[])(LocalMapObject *); -extern int (*const Unk_020EF14C[])(LocalMapObject *); -extern int (*const Unk_020EF140[])(LocalMapObject *); -extern int (*const Unk_020EF134[])(LocalMapObject *); -extern int (*const Unk_020EF128[])(LocalMapObject *); -extern int (*const Unk_020EF11C[])(LocalMapObject *); -extern int (*const Unk_020EF110[])(LocalMapObject *); -extern int (*const Unk_020EF104[])(LocalMapObject *); -extern int (*const Unk_020EF0F8[])(LocalMapObject *); -extern int (*const Unk_020EF0EC[])(LocalMapObject *); -extern int (*const Unk_020EF0E0[])(LocalMapObject *); -extern int (*const Unk_020EF0D4[])(LocalMapObject *); -extern int (*const Unk_020EF0C8[])(LocalMapObject *); -extern int (*const Unk_020EF0BC[])(LocalMapObject *); -extern int (*const Unk_020EF2CC[])(LocalMapObject *); -extern int (*const Unk_020EF0A4[])(LocalMapObject *); -extern int (*const Unk_020EF098[])(LocalMapObject *); -extern int (*const Unk_020EF08C[])(LocalMapObject *); -extern int (*const Unk_020EF080[])(LocalMapObject *); -extern int (*const Unk_020EF074[])(LocalMapObject *); -extern int (*const Unk_020EF068[])(LocalMapObject *); -extern int (*const Unk_020EF05C[])(LocalMapObject *); -extern int (*const Unk_020EF050[])(LocalMapObject *); -extern int (*const Unk_020EF044[])(LocalMapObject *); -extern int (*const Unk_020EF038[])(LocalMapObject *); -extern int (*const Unk_020EF014[])(LocalMapObject *); -extern int (*const Unk_020EF5CC[])(LocalMapObject *); -extern int (*const Unk_020EEFF0[])(LocalMapObject *); -extern int (*const Unk_020EEFE4[])(LocalMapObject *); -extern int (*const Unk_020EEFD8[])(LocalMapObject *); -extern int (*const Unk_020EEFCC[])(LocalMapObject *); -extern int (*const Unk_020EEFC0[])(LocalMapObject *); -extern int (*const Unk_020EEFB4[])(LocalMapObject *); -extern int (*const Unk_020EEFA8[])(LocalMapObject *); -extern int (*const Unk_020EF0B0[])(LocalMapObject *); -extern int (*const Unk_020EEF90[])(LocalMapObject *); -extern int (*const Unk_020EEF84[])(LocalMapObject *); -extern int (*const Unk_020EEF6C[])(LocalMapObject *); -extern int (*const Unk_020EEF78[])(LocalMapObject *); -extern int (*const Unk_020EF008[])(LocalMapObject *); -extern int (*const Unk_020EF02C[])(LocalMapObject *); -extern int (*const Unk_020EF1AC[])(LocalMapObject *); -extern int (*const Unk_020EF5D8[])(LocalMapObject *); -extern int (*const Unk_020EECBC[])(LocalMapObject *); -extern int (*const Unk_020EECB0[])(LocalMapObject *); -extern int (*const Unk_020EECA4[])(LocalMapObject *); -extern int (*const Unk_020EEF9C[])(LocalMapObject *); -extern int (*const Unk_020EEF60[])(LocalMapObject *); -extern int (*const Unk_020EEFFC[])(LocalMapObject *); -extern int (*const Unk_020EF170[])(LocalMapObject *); -extern int (*const Unk_020EF5E4[])(LocalMapObject *); +extern int (*const Unk_020EEC78[])(MapObject *); +extern int (*const Unk_020EEC48[])(MapObject *); +extern int (*const Unk_020EEC88[])(MapObject *); +extern int (*const Unk_020EEC80[])(MapObject *); +extern int (*const Unk_020EF59C[])(MapObject *); +extern int (*const Unk_020EF590[])(MapObject *); +extern int (*const Unk_020EF584[])(MapObject *); +extern int (*const Unk_020EF578[])(MapObject *); +extern int (*const Unk_020EF56C[])(MapObject *); +extern int (*const Unk_020EF560[])(MapObject *); +extern int (*const Unk_020EF554[])(MapObject *); +extern int (*const Unk_020EF548[])(MapObject *); +extern int (*const Unk_020EF53C[])(MapObject *); +extern int (*const Unk_020EF530[])(MapObject *); +extern int (*const Unk_020EF524[])(MapObject *); +extern int (*const Unk_020EF518[])(MapObject *); +extern int (*const Unk_020EF50C[])(MapObject *); +extern int (*const Unk_020EF500[])(MapObject *); +extern int (*const Unk_020EF4F4[])(MapObject *); +extern int (*const Unk_020EF4E8[])(MapObject *); +extern int (*const Unk_020EF4DC[])(MapObject *); +extern int (*const Unk_020EF4D0[])(MapObject *); +extern int (*const Unk_020EF4C4[])(MapObject *); +extern int (*const Unk_020EF4B8[])(MapObject *); +extern int (*const Unk_020EF4AC[])(MapObject *); +extern int (*const Unk_020EF4A0[])(MapObject *); +extern int (*const Unk_020EF494[])(MapObject *); +extern int (*const Unk_020EF488[])(MapObject *); +extern int (*const Unk_020EF194[])(MapObject *); +extern int (*const Unk_020EF224[])(MapObject *); +extern int (*const Unk_020EF440[])(MapObject *); +extern int (*const Unk_020EF470[])(MapObject *); +extern int (*const Unk_020EF47C[])(MapObject *); +extern int (*const Unk_020EF230[])(MapObject *); +extern int (*const Unk_020EF458[])(MapObject *); +extern int (*const Unk_020EF464[])(MapObject *); +extern int (*const Unk_020EF5A8[])(MapObject *); +extern int (*const Unk_020EF5B4[])(MapObject *); +extern int (*const Unk_020EF434[])(MapObject *); +extern int (*const Unk_020EF428[])(MapObject *); +extern int (*const Unk_020EF41C[])(MapObject *); +extern int (*const Unk_020EF410[])(MapObject *); +extern int (*const Unk_020EF404[])(MapObject *); +extern int (*const Unk_020EF3F8[])(MapObject *); +extern int (*const Unk_020EF3EC[])(MapObject *); +extern int (*const Unk_020EF3E0[])(MapObject *); +extern int (*const Unk_020EF3D4[])(MapObject *); +extern int (*const Unk_020EF3C8[])(MapObject *); +extern int (*const Unk_020EF3BC[])(MapObject *); +extern int (*const Unk_020EF3B0[])(MapObject *); +extern int (*const Unk_020EF3A4[])(MapObject *); +extern int (*const Unk_020EF398[])(MapObject *); +extern int (*const Unk_020EF38C[])(MapObject *); +extern int (*const Unk_020EF380[])(MapObject *); +extern int (*const Unk_020EF374[])(MapObject *); +extern int (*const Unk_020EF368[])(MapObject *); +extern int (*const Unk_020EF35C[])(MapObject *); +extern int (*const Unk_020EF350[])(MapObject *); +extern int (*const Unk_020EF344[])(MapObject *); +extern int (*const Unk_020EF338[])(MapObject *); +extern int (*const Unk_020EF32C[])(MapObject *); +extern int (*const Unk_020EF320[])(MapObject *); +extern int (*const Unk_020EF314[])(MapObject *); +extern int (*const Unk_020EF308[])(MapObject *); +extern int (*const Unk_020EF2FC[])(MapObject *); +extern int (*const Unk_020EF2F0[])(MapObject *); +extern int (*const Unk_020EF2E4[])(MapObject *); +extern int (*const Unk_020EF2D8[])(MapObject *); +extern int (*const Unk_020EEC98[])(MapObject *); +extern int (*const Unk_020EF2C0[])(MapObject *); +extern int (*const Unk_020EF2B4[])(MapObject *); +extern int (*const Unk_020EF2A8[])(MapObject *); +extern int (*const Unk_020EF020[])(MapObject *); +extern int (*const Unk_020EF17C[])(MapObject *); +extern int (*const Unk_020EF1A0[])(MapObject *); +extern int (*const Unk_020EF44C[])(MapObject *); +extern int (*const Unk_020EF29C[])(MapObject *); +extern int (*const Unk_020EF290[])(MapObject *); +extern int (*const Unk_020EF284[])(MapObject *); +extern int (*const Unk_020EF278[])(MapObject *); +extern int (*const Unk_020EF26C[])(MapObject *); +extern int (*const Unk_020EF260[])(MapObject *); +extern int (*const Unk_020EF254[])(MapObject *); +extern int (*const Unk_020EF248[])(MapObject *); +extern int (*const Unk_020EF23C[])(MapObject *); +extern int (*const Unk_020EEC70[])(MapObject *); +extern int (*const Unk_020EEC68[])(MapObject *); +extern int (*const Unk_020EEC50[])(MapObject *); +extern int (*const Unk_020EEC90[])(MapObject *); +extern int (*const Unk_020EEC58[])(MapObject *); +extern int (*const Unk_020EEC60[])(MapObject *); +extern int (*const Unk_020EF218[])(MapObject *); +extern int (*const Unk_020EF20C[])(MapObject *); +extern int (*const Unk_020EF200[])(MapObject *); +extern int (*const Unk_020EF1F4[])(MapObject *); +extern int (*const Unk_020EF1E8[])(MapObject *); +extern int (*const Unk_020EF1DC[])(MapObject *); +extern int (*const Unk_020EF1D0[])(MapObject *); +extern int (*const Unk_020EF1C4[])(MapObject *); +extern int (*const Unk_020EF1B8[])(MapObject *); +extern int (*const Unk_020EF188[])(MapObject *); +extern int (*const Unk_020EF5C0[])(MapObject *); +extern int (*const Unk_020EF164[])(MapObject *); +extern int (*const Unk_020EF158[])(MapObject *); +extern int (*const Unk_020EF14C[])(MapObject *); +extern int (*const Unk_020EF140[])(MapObject *); +extern int (*const Unk_020EF134[])(MapObject *); +extern int (*const Unk_020EF128[])(MapObject *); +extern int (*const Unk_020EF11C[])(MapObject *); +extern int (*const Unk_020EF110[])(MapObject *); +extern int (*const Unk_020EF104[])(MapObject *); +extern int (*const Unk_020EF0F8[])(MapObject *); +extern int (*const Unk_020EF0EC[])(MapObject *); +extern int (*const Unk_020EF0E0[])(MapObject *); +extern int (*const Unk_020EF0D4[])(MapObject *); +extern int (*const Unk_020EF0C8[])(MapObject *); +extern int (*const Unk_020EF0BC[])(MapObject *); +extern int (*const Unk_020EF2CC[])(MapObject *); +extern int (*const Unk_020EF0A4[])(MapObject *); +extern int (*const Unk_020EF098[])(MapObject *); +extern int (*const Unk_020EF08C[])(MapObject *); +extern int (*const Unk_020EF080[])(MapObject *); +extern int (*const Unk_020EF074[])(MapObject *); +extern int (*const Unk_020EF068[])(MapObject *); +extern int (*const Unk_020EF05C[])(MapObject *); +extern int (*const Unk_020EF050[])(MapObject *); +extern int (*const Unk_020EF044[])(MapObject *); +extern int (*const Unk_020EF038[])(MapObject *); +extern int (*const Unk_020EF014[])(MapObject *); +extern int (*const Unk_020EF5CC[])(MapObject *); +extern int (*const Unk_020EEFF0[])(MapObject *); +extern int (*const Unk_020EEFE4[])(MapObject *); +extern int (*const Unk_020EEFD8[])(MapObject *); +extern int (*const Unk_020EEFCC[])(MapObject *); +extern int (*const Unk_020EEFC0[])(MapObject *); +extern int (*const Unk_020EEFB4[])(MapObject *); +extern int (*const Unk_020EEFA8[])(MapObject *); +extern int (*const Unk_020EF0B0[])(MapObject *); +extern int (*const Unk_020EEF90[])(MapObject *); +extern int (*const Unk_020EEF84[])(MapObject *); +extern int (*const Unk_020EEF6C[])(MapObject *); +extern int (*const Unk_020EEF78[])(MapObject *); +extern int (*const Unk_020EF008[])(MapObject *); +extern int (*const Unk_020EF02C[])(MapObject *); +extern int (*const Unk_020EF1AC[])(MapObject *); +extern int (*const Unk_020EF5D8[])(MapObject *); +extern int (*const Unk_020EECBC[])(MapObject *); +extern int (*const Unk_020EECB0[])(MapObject *); +extern int (*const Unk_020EECA4[])(MapObject *); +extern int (*const Unk_020EEF9C[])(MapObject *); +extern int (*const Unk_020EEF60[])(MapObject *); +extern int (*const Unk_020EEFFC[])(MapObject *); +extern int (*const Unk_020EF170[])(MapObject *); +extern int (*const Unk_020EF5E4[])(MapObject *); static const UnkStruct_020EDF0C Unk_020EDF0C = { @@ -786,7 +786,7 @@ const UnkStruct_020EDF0C * const Unk_020EE3A8[] = { &Unk_020EE2B8 }; -int (*const * const Unk_020EE4B8[0x9a])(LocalMapObject *) = { +int (*const * const Unk_020EE4B8[0x9a])(MapObject *) = { Unk_020EEC78, Unk_020EEC48, Unk_020EEC88,