cleanup map_object.c 1

red031000 · Feb 27, 2024 · 42856c0 · 42856c0
1 parent 9a7a06f
commit 42856c0
Show file tree

Hide file tree

Showing 38 changed files with 84 additions and 98 deletions.
diff --git a/asm/include/overlay_01_021F8D80.inc b/asm/include/overlay_01_021F8D80.inc
@@ -12,7 +12,7 @@
 .public sub_02023F30
 .public sub_02023F40
 .public GF_AssertFail
-.public MapObjectManager_GetCount
+.public MapObjectManager_GetObjectCount
 .public MapObjectManager_SetFlagsBits
 .public MapObjectManager_ClearFlagsBits
 .public MapObjectManager_GetFlagsBitsMask

diff --git a/asm/include/overlay_01_021F944C.inc b/asm/include/overlay_01_021F944C.inc
@@ -47,7 +47,7 @@
 .public sub_0205E420
 .public sub_0205EEF4
 .public sub_0205F09C
-.public MapObjectManager_GetCount
+.public MapObjectManager_GetObjectCount
 .public MapObjectManager_GetHeapID
 .public sub_0205F1A0
 .public sub_0205F1AC

diff --git a/asm/include/overlay_02.inc b/asm/include/overlay_02.inc
@@ -253,7 +253,7 @@
 .public sub_0205E38C
 .public sub_0205E420
 .public GetMapObjectByID
-.public MapObjectManager_GetCount
+.public MapObjectManager_GetObjectCount
 .public MapObjectManager_GetObjects
 .public sub_0205F1D0
 .public MapObject_GetID

diff --git a/asm/include/overlay_04.inc b/asm/include/overlay_04.inc
@@ -42,7 +42,7 @@
 .public PlayerAvatar_ToggleAutomaticHeightUpdating
 .public PlayerAvatar_ToggleAutomaticHeightUpdating_NowApply
 .public GetMapObjectByID
-.public MapObjectManager_GetCount
+.public MapObjectManager_GetObjectCount
 .public MapObjectManager_GetObjects
 .public sub_0205F1D0
 .public MapObject_GetID

diff --git a/asm/include/unk_0205FD20.inc b/asm/include/unk_0205FD20.inc
@@ -29,7 +29,7 @@
 .public sub_0205BA6C
 .public sub_0205BA70
 .public sub_0205BA94
-.public MapObjectManager_GetCount
+.public MapObjectManager_GetObjectCount
 .public sub_0205F1AC
 .public sub_0205F1C4
 .public MapObject_GetFlagsWord

diff --git a/asm/overlay_01_021F8D80.s b/asm/overlay_01_021F8D80.s
@@ -661,7 +661,7 @@ _021F9212:
 	add r0, r5, #0
 	bl FldObjSys_OpenMModelNarc
 	add r0, r5, #0
-	bl MapObjectManager_GetCount
+	bl MapObjectManager_GetObjectCount
 	str r0, [sp, #0x14]
 	add r0, r5, #0
 	bl MapObjectManager_GetHeapID

diff --git a/asm/overlay_01_021F944C.s b/asm/overlay_01_021F944C.s
@@ -493,7 +493,7 @@ ov01_021F97BC: ; 0x021F97BC
 	add r7, r0, #0
 	add r5, r1, #0
 	add r6, r2, #0
-	bl MapObjectManager_GetCount
+	bl MapObjectManager_GetObjectCount
 	add r4, r0, #0
 	add r0, r7, #0
 	bl sub_0205F1AC

diff --git a/asm/overlay_02.s b/asm/overlay_02.s
@@ -20327,7 +20327,7 @@ ov02_0224F4BC: ; 0x0224F4BC
 	bl GetPlayerYCoord
 	str r0, [sp]
 	ldr r0, [r4, #0x3c]
-	bl MapObjectManager_GetCount
+	bl MapObjectManager_GetObjectCount
 	str r0, [sp, #8]
 	ldr r0, [r4, #0x3c]
 	bl MapObjectManager_GetObjects

diff --git a/asm/overlay_04.s b/asm/overlay_04.s
@@ -2133,7 +2133,7 @@ ov04_02254F44: ; 0x02254F44
 	push {r3, r4, r5, r6, r7, lr}
 	add r4, r0, #0
 	ldr r0, [r4, #0x3c]
-	bl MapObjectManager_GetCount
+	bl MapObjectManager_GetObjectCount
 	add r5, r0, #0
 	ldr r0, [r4, #0x3c]
 	bl MapObjectManager_GetObjects

diff --git a/asm/unk_0205FD20.s b/asm/unk_0205FD20.s
@@ -1868,7 +1868,7 @@ sub_02060BFC: ; 0x02060BFC
 	bl sub_0205F1AC
 	str r0, [sp, #8]
 	add r0, r5, #0
-	bl MapObjectManager_GetCount
+	bl MapObjectManager_GetObjectCount
 	str r0, [sp, #4]
 _02060C1C:
 	ldr r0, [sp, #8]
@@ -1951,7 +1951,7 @@ sub_02060CA8: ; 0x02060CA8
 	bl sub_0205F1AC
 	str r0, [sp, #4]
 	add r0, r7, #0
-	bl MapObjectManager_GetCount
+	bl MapObjectManager_GetObjectCount
 	add r7, r0, #0
 _02060CC8:
 	ldr r0, [sp, #4]

diff --git a/include/follow_mon.h b/include/follow_mon.h
@@ -1,7 +1,7 @@
 #ifndef POKEHEARTGOLD_FOLLOW_MON_H
 #define POKEHEARTGOLD_FOLLOW_MON_H
 
-#include "field_map_object.h"
+#include "map_object.h"
 #include "heap.h"
 #include "map_object_manager.h"
 

diff --git a/include/field_map_object.h → include/map_object.h b/include/field_map_object.h → include/map_object.h
@@ -1,5 +1,5 @@
-#ifndef POKEHEARTGOLD_FIELD_MAP_OBJECT_H
-#define POKEHEARTGOLD_FIELD_MAP_OBJECT_H
+#ifndef POKEHEARTGOLD_MAP_OBJECT_H
+#define POKEHEARTGOLD_MAP_OBJECT_H
 
 #include "script.h"
 
@@ -154,9 +154,9 @@ typedef enum MapObjectFlagBits {
 struct MapObjectInitArgs;
 
 // FIXME: Some of these declarations are static and don't belong in here.
-MapObjectManager *sub_0205E0BC(FieldSystem *fieldSystem, int num, HeapID heapId);
-void MapObjectManager_Delete(MapObjectManager *man);
-void sub_0205E104(MapObjectManager* manager, u32 a1, u32 a2, u32 num_object_events, ObjectEvent* object_events);
+MapObjectManager *MapObjectManager_Init(FieldSystem *fieldSystem, u32 objectCount, HeapID heapId);
+void MapObjectManager_Delete(MapObjectManager *manager);
+void sub_0205E104(MapObjectManager *manager, u32 unused, u32 a2, u32 objectCount, ObjectEvent* objectEvents);
 MapObjectManager* MapObjectManager_New(u32 count);
 LocalMapObject* sub_0205E1D0(MapObjectManager* manager, ObjectEvent* object_events, u32 map_no);
 LocalMapObject *CreateSpecialFieldObject(MapObjectManager *objectMan, u32 x, u32 z, u32 direction, u32 sprite, u32 movement, u32 mapNo);
@@ -206,8 +206,8 @@ BOOL sub_0205F0F8(LocalMapObject* object, u32 gfx_id, u32 id, u32 a3);
 void sub_0205F12C(SysTask* task, LocalMapObject* object);
 void sub_0205F148(LocalMapObject* object);
 MapObjectManager* sub_0205F160(MapObjectManager* manager);
-void MapObjectManager_SetCount(MapObjectManager*, u32);
-u32 MapObjectManager_GetCount(MapObjectManager*);
+void MapObjectManager_SetObjectCount(MapObjectManager*, u32);
+u32 MapObjectManager_GetObjectCount(MapObjectManager*);
 void sub_0205F16C(MapObjectManager* manager);
 void sub_0205F174(MapObjectManager* manager);
 void MapObjectManager_SetFlagsBits(MapObjectManager* manager, u32 bits);
@@ -222,7 +222,7 @@ const LocalMapObject* MapObjectManager_GetConstObjects(MapObjectManager*);
 LocalMapObject* MapObjectManager_GetObjects(MapObjectManager*);
 void sub_0205F1C4(LocalMapObject** objects);
 void sub_0205F1D0(LocalMapObject** objects);
-void MapObjectManager_SetFieldSysPtr(MapObjectManager*, FieldSystem*);
+void MapObjectManager_SetFieldSystemPtr(MapObjectManager*, FieldSystem*);
 FieldSystem* MapObjectManager_GetFieldSystemPtr(MapObjectManager*);
 void FldObjSys_SetMModelNarc(MapObjectManager* manager, NARC* mmodel_narc);
 NARC* FldObjSys_GetMModelNarc(MapObjectManager* manager);
@@ -442,4 +442,4 @@ void sub_0205FCBC(LocalMapObject* object);
 void sub_0205FCC0(LocalMapObject* object);
 void sub_0205FCD4(LocalMapObject* object);
 
-#endif //POKEHEARTGOLD_FIELD_MAP_OBJECT_H
+#endif //POKEHEARTGOLD_MAP_OBJECT_H
diff --git a/include/overlay_01_021F1348.h b/include/overlay_01_021F1348.h
@@ -1,7 +1,7 @@
 #ifndef POKEHEARTGOLD_OV_01_021F1348_H
 #define POKEHEARTGOLD_OV_01_021F1348_H
 
-#include "field_map_object.h"
+#include "map_object.h"
 #include "script.h"
 #include "task.h"
 #include "unk_020689C8.h"

diff --git a/include/overlay_01_021F72DC.h b/include/overlay_01_021F72DC.h
@@ -1,7 +1,7 @@
 #ifndef POKEHEARTGOLD_OVERLAY_01_021F72DC_H
 #define POKEHEARTGOLD_OVERLAY_01_021F72DC_H
 
-#include "field_map_object.h"
+#include "map_object.h"
 #include "unk_02023694.h"
 
 Sprite *ov01_021F72DC(LocalMapObject *obj);

diff --git a/include/unk_0205FD20.h b/include/unk_0205FD20.h
@@ -1,7 +1,7 @@
 #ifndef POKEHEARTGOLD_UNK_0205FD20_H
 #define POKEHEARTGOLD_UNK_0205FD20_H
 
-#include "field_map_object.h"
+#include "map_object.h"
 #include "task.h"
 
 void sub_02061070(LocalMapObject *object);

diff --git a/include/unk_020658D4.h b/include/unk_020658D4.h
@@ -1,7 +1,7 @@
 #ifndef POKEHEARTGOLD_UNK_020658D4_H
 #define POKEHEARTGOLD_UNK_020658D4_H
 
-#include "field_map_object.h"
+#include "map_object.h"
 
 LocalMapObject *sub_020660C0(LocalMapObject *lastTalked);
 int sub_02066420(LocalMapObject *mapObject, int a1);

diff --git a/main.lsf b/main.lsf
@@ -217,7 +217,7 @@ Static main
 	Object asm/unk_0205BFF0.o
 	Object src/field_player_avatar.o
 	Object asm/unk_0205CB48.o
-	Object src/field_map_object.o
+	Object src/map_object.o
 	Object asm/unk_data_020FCBD8.o
 	Object asm/unk_0205FD20.o
 	Object asm/unk_02061284.o

diff --git a/src/encounter.c b/src/encounter.c
@@ -2,7 +2,7 @@
 #include "battle/battle_setup.h"
 #include "encounter.h"
 #include "blackout.h"
-#include "field_map_object.h"
+#include "map_object.h"
 #include "field_system.h"
 #include "field_warp_tasks.h"
 #include "game_clear.h"
@@ -37,7 +37,7 @@
 #include "unk_020552A4.h"
 #include "unk_02034354.h"
 #include "unk_02066EDC.h"
-#include "field_map_object.h"
+#include "map_object.h"
 #include "field_warp_tasks.h"
 #include "unk_02058034.h"
 #include "pokedex_util.h"

diff --git a/src/field/overlay_01_021FFECC.c b/src/field/overlay_01_021FFECC.c
@@ -1,4 +1,4 @@
-#include "field_map_object.h"
+#include "map_object.h"
 #include "field_player_avatar.h"
 #include "overlay_01_021FFECC.h"
 #include "unk_0205FD20.h"

diff --git a/src/field/overlay_01_apricorn_tree_anim.c b/src/field/overlay_01_apricorn_tree_anim.c
@@ -1,4 +1,4 @@
-#include "field_map_object.h"
+#include "map_object.h"
 #include "overlay_01_021F1AFC.h"
 #include "overlay_01_021F944C.h"
 #include "overlay_01_apricorn_tree_anim.h"

diff --git a/src/field/scrcmd_message.c b/src/field/scrcmd_message.c
@@ -1,4 +1,4 @@
-#include "field_map_object.h"
+#include "map_object.h"
 #include "field_system.h"
 #include "fieldmap.h"
 #include "font.h"

diff --git a/src/field/scrcmd_pokemon_misc.c b/src/field/scrcmd_pokemon_misc.c
@@ -2,7 +2,7 @@
 #include "bag.h"
 #include "bug_contest.h"
 #include "fieldmap.h"
-#include "field_map_object.h"
+#include "map_object.h"
 #include "friend_group.h"
 #include "gf_gfx_loader.h"
 #include "photo_album.h"

diff --git a/src/field_move.c b/src/field_move.c
@@ -1,6 +1,6 @@
 #include "script.h"
 #include "field_move.h"
-#include "field_map_object.h"
+#include "map_object.h"
 #include "alph_checks.h"
 #include "field_player_avatar.h"
 #include "unk_0203DB6C.h"

diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "field_player_avatar.h"
 #include "assert.h"
-#include "field_map_object.h"
+#include "map_object.h"
 #include "heap.h"
 #include "overlay_00_thumb.h"
 #include "overlay_01.h"

diff --git a/src/field_use_item.c b/src/field_use_item.c
@@ -6,7 +6,7 @@
 #include "unk_0203DFA4.h"
 #include "unk_02078E30.h"
 #include "follow_mon.h"
-#include "field_map_object.h"
+#include "map_object.h"
 #include "save_arrays.h"
 #include "sound_radio.h"
 #include "sound_02004A44.h"

diff --git a/src/field_warp_tasks.c b/src/field_warp_tasks.c
@@ -9,7 +9,7 @@
 #include "unk_02054E00.h"
 #include "unk_0206793C.h"
 #include "unk_0203BA5C.h"
-#include "field_map_object.h"
+#include "map_object.h"
 #include "follow_mon.h"
 #include "unk_02056D7C.h"
 #include "field_system_rtc_weather.h"
@@ -223,7 +223,7 @@ static void sub_0205316C(FieldSystem *fieldSystem) {
         playerSaveData = LocalFieldData_GetPlayer(Save_LocalFieldData_Get(fieldSystem->saveData));
         fieldSystem->playerAvatar = sub_0205C390(fieldSystem->mapObjectManager, fieldSystem->location->x, fieldSystem->location->y, fieldSystem->location->direction, playerSaveData->unk4, gender, 2, playerSaveData);
     } else {
-        fieldSystem->mapObjectManager = sub_0205E0BC(fieldSystem, 64, HEAP_ID_BATTLE);
+        fieldSystem->mapObjectManager = MapObjectManager_Init(fieldSystem, 64, HEAP_ID_BATTLE);
         gender = PlayerProfile_GetTrainerGender(Save_PlayerData_GetProfileAddr(fieldSystem->saveData));
         playerSaveData = LocalFieldData_GetPlayer(Save_LocalFieldData_Get(fieldSystem->saveData));
         fieldSystem->playerAvatar = sub_0205C390(fieldSystem->mapObjectManager, fieldSystem->location->x, fieldSystem->location->y, fieldSystem->location->direction, playerSaveData->unk4, gender, 2, playerSaveData);
@@ -248,7 +248,7 @@ static void sub_0205323C(FieldSystem *fieldSystem) {
     u32 gender;
     struct PlayerSaveData *playerSaveData;
 
-    fieldSystem->mapObjectManager = sub_0205E0BC(fieldSystem, 64, HEAP_ID_BATTLE);
+    fieldSystem->mapObjectManager = MapObjectManager_Init(fieldSystem, 64, HEAP_ID_BATTLE);
     FieldSystem_RestoreMapObjectsFromSave(fieldSystem);
     playerSaveData = LocalFieldData_GetPlayer(Save_LocalFieldData_Get(fieldSystem->saveData));
     gender = PlayerProfile_GetTrainerGender(Save_PlayerData_GetProfileAddr(fieldSystem->saveData));

diff --git a/src/fieldmap.c b/src/fieldmap.c
@@ -5,7 +5,7 @@
 #include "save_vars_flags.h"
 #include "map_events.h"
 #include "task.h"
-#include "field_map_object.h"
+#include "map_object.h"
 #include "constants/std_script.h"
 #include "fielddata/script/scr_seq.naix"
 #include "msgdata/msg.naix"

diff --git a/src/follow_mon.c b/src/follow_mon.c
@@ -2,7 +2,7 @@
 #include "map_object_manager.h"
 #include "save_follow_mon.h"
 #include "script_pokemon_util.h"
-#include "field_map_object.h"
+#include "map_object.h"
 #include "map_header.h"
 #include "follow_mon.h"
 #include "constants/scrcmd.h"

diff --git a/src/map_events.c b/src/map_events.c
@@ -1,7 +1,7 @@
 #include "map_events.h"
 #include "filesystem.h"
 #include "encounter_tables_narc.h"
-#include "field_map_object.h"
+#include "map_object.h"
 
 static void MapEvents_ReadFromNarc(MapEvents *events, u32 mapno);
 static void MapEvents_ComputeRamHeader(MapEvents *events);