some more map object cleanup

pret · Oct 28, 2024 · 6db022f · 6db022f
1 parent 1f32096
commit 6db022f
Show file tree

Hide file tree

Showing 47 changed files with 129 additions and 127 deletions.
diff --git a/asm/include/overlay_01_021F944C.inc b/asm/include/overlay_01_021F944C.inc
@@ -46,7 +46,7 @@
 .public sub_0205E38C
 .public sub_0205E420
 .public MapObjectManager_GetNextObjectWithFlagFromIndex
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public MapObjectManager_GetObjectCount
 .public MapObjectManager_GetPriority
 .public sub_0205F1A0

diff --git a/asm/include/overlay_01_021FD1B8.inc b/asm/include/overlay_01_021FD1B8.inc
@@ -1,7 +1,7 @@
 #include <nitro/fs/overlay.h>
 #pragma once
 .public GF_AssertFail
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public sub_0205F0A8
 .public MapObject_GetID
 .public MapObject_GetMapID

diff --git a/asm/include/overlay_01_021FD41C.inc b/asm/include/overlay_01_021FD41C.inc
@@ -3,7 +3,7 @@
 .public SysTask_CreateOnMainQueue
 .public SysTask_Destroy
 .public GF_RTC_GetTimeOfDay
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public sub_0205F0F8
 .public MapObjectManager_GetPriority
 .public MapObject_TestFlagsBits

diff --git a/asm/include/overlay_01_021FDA14.inc b/asm/include/overlay_01_021FDA14.inc
@@ -13,7 +13,7 @@
 .public sub_02023F70
 .public sub_02023FC0
 .public PlayerAvatar_GetMapObject
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public sub_0205F0A8
 .public MapObject_GetID
 .public MapObject_GetMapID

diff --git a/asm/include/overlay_01_021FE200.inc b/asm/include/overlay_01_021FE200.inc
@@ -1,7 +1,7 @@
 #include <nitro/fs/overlay.h>
 #pragma once
 .public GF_AssertFail
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public MapObject_TestFlagsBits
 .public MapObject_GetFacingDirection
 .public MapObject_GetPreviousFacingDirection

diff --git a/asm/include/overlay_01_021FE780.inc b/asm/include/overlay_01_021FE780.inc
@@ -1,7 +1,7 @@
 #include <nitro/fs/overlay.h>
 #pragma once
 .public sub_02020DA4
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public sub_0205F0A8
 .public MapObject_GetID
 .public MapObject_GetMapID

diff --git a/asm/include/overlay_01_021FEA0C.inc b/asm/include/overlay_01_021FEA0C.inc
@@ -2,7 +2,7 @@
 #pragma once
 .public sub_02020DA4
 .public GF_AssertFail
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public MapObject_GetFieldSystem
 .public MapObject_GetPositionVec
 .public sub_0205F9A0

diff --git a/asm/include/overlay_01_021FEC38.inc b/asm/include/overlay_01_021FEC38.inc
@@ -1,6 +1,6 @@
 #include <nitro/fs/overlay.h>
 #pragma once
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public MapObject_TestFlagsBits
 .public MapObject_GetPrevHeight
 .public sub_020611C8

diff --git a/asm/include/overlay_01_021FED9C.inc b/asm/include/overlay_01_021FED9C.inc
@@ -1,6 +1,6 @@
 #include <nitro/fs/overlay.h>
 #pragma once
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public MapObject_GetPrevHeight
 .public sub_020611C8
 .public sub_02068D98

diff --git a/asm/include/overlay_01_021FEEEC.inc b/asm/include/overlay_01_021FEEEC.inc
@@ -6,7 +6,7 @@
 .public sub_02023F04
 .public sub_02023F1C
 .public sub_02023F70
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public sub_0205F0F8
 .public MapObject_TestFlagsBits
 .public MapObject_GetID

diff --git a/asm/include/overlay_01_021FF464.inc b/asm/include/overlay_01_021FF464.inc
@@ -6,7 +6,7 @@
 .public sub_02023F04
 .public sub_02023F1C
 .public sub_02023F70
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public sub_0205F0F8
 .public MapObject_TestFlagsBits
 .public MapObject_GetID

diff --git a/asm/include/overlay_01_021FF6B0.inc b/asm/include/overlay_01_021FF6B0.inc
@@ -4,7 +4,7 @@
 .public sub_02023E50
 .public sub_02023F04
 .public sub_02023F70
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public MapObject_GetID
 .public MapObject_GetMapID
 .public MapObject_GetFieldSystem

diff --git a/asm/include/overlay_01_021FF854.inc b/asm/include/overlay_01_021FF854.inc
@@ -6,7 +6,7 @@
 .public sub_02023F04
 .public sub_02023F1C
 .public sub_02023F70
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public sub_0205F0F8
 .public MapObject_TestFlagsBits
 .public MapObject_GetID

diff --git a/asm/include/overlay_01_02200040.inc b/asm/include/overlay_01_02200040.inc
@@ -4,7 +4,7 @@
 .public sub_02023E50
 .public sub_02023F04
 .public sub_02023F70
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public MapObject_GetID
 .public MapObject_GetMapID
 .public MapObject_GetFieldSystem

diff --git a/asm/include/overlay_01_022001E4.inc b/asm/include/overlay_01_022001E4.inc
@@ -9,7 +9,7 @@
 .public sub_0205F0A8
 .public MapObject_GetID
 .public MapObject_GetMapID
-.public sub_0205F538
+.public MapObject_GetPriority
 .public MapObject_GetPositionVec
 .public MapObject_GetFacingVec
 .public sub_02068D74

diff --git a/asm/include/overlay_01_022006A8.inc b/asm/include/overlay_01_022006A8.inc
@@ -2,7 +2,7 @@
 #pragma once
 .public sub_02023DA4
 .public sub_02023E50
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public sub_0205F0A8
 .public MapObject_GetID
 .public MapObject_GetMapID

diff --git a/asm/include/overlay_01_02200858.inc b/asm/include/overlay_01_02200858.inc
@@ -7,7 +7,7 @@
 .public sub_0205B73C
 .public PlayerAvatar_GetFacingDirection
 .public PlayerAvatar_GetMapObject
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public sub_0205F0A8
 .public MapObject_GetID
 .public MapObject_GetMapID

diff --git a/asm/include/overlay_01_022031C0.inc b/asm/include/overlay_01_022031C0.inc
@@ -5,7 +5,7 @@
 .public sub_02023E78
 .public sub_02023FB0
 .public GF_AssertFail
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public sub_0205F0F8
 .public MapObject_GetID
 .public MapObject_GetMapID

diff --git a/asm/include/overlay_01_02203A18.inc b/asm/include/overlay_01_02203A18.inc
@@ -20,7 +20,7 @@
 .public sub_0205F0A8
 .public MapObject_GetID
 .public MapObject_GetMapID
-.public sub_0205F538
+.public MapObject_GetPriority
 .public MapObject_GetPositionVec
 .public MapObject_GetFacingVec
 .public sub_0205F990

diff --git a/asm/include/overlay_01_02203E40.inc b/asm/include/overlay_01_02203E40.inc
@@ -2,7 +2,7 @@
 #pragma once
 .public GF3dRender_DrawModel
 .public Camera_GetLookAtCamPos
-.public sub_0205F09C
+.public MapObject_GetPriorityPlusValue
 .public MapObject_GetPositionVec
 .public sub_02068D74
 .public sub_02068D90

diff --git a/asm/include/unk_02062108.inc b/asm/include/unk_02062108.inc
@@ -21,7 +21,7 @@
 .public MapObject_SetMovementCommand
 .public MapObject_GetMovementCommand
 .public MapObject_SetMovementStep
-.public MapObject_IncMovementStep
+.public MapObject_IncrementMovementStep
 .public MapObject_GetMovementStep
 .public MapObject_CheckVisible
 .public MapObject_SetFacingVec

diff --git a/asm/include/unk_020632B0.inc b/asm/include/unk_020632B0.inc
@@ -45,7 +45,7 @@
 .public sub_0205F3E8
 .public sub_0205F40C
 .public sub_0205F484
-.public MapObject_IncMovementStep
+.public MapObject_IncrementMovementStep
 .public MapObject_GetFieldSystem
 .public MapObject_IsSingleMovementActive
 .public MapObject_CheckVisible

diff --git a/asm/overlay_01_021F944C.s b/asm/overlay_01_021F944C.s
@@ -3193,7 +3193,7 @@ _021FAAAA:
 	bne _021FAB4A
 	add r0, r6, #0
 	mov r1, #2
-	bl sub_0205F09C
+	bl MapObject_GetPriorityPlusValue
 	str r0, [sp, #0xc]
 	add r0, r6, #0
 	mov r1, #1

diff --git a/asm/overlay_01_021FD1B8.s b/asm/overlay_01_021FD1B8.s
@@ -211,7 +211,7 @@ ov01_021FD2EC: ; 0x021FD2EC
 	mov r1, #2
 	str r4, [sp, #0xc]
 	str r5, [sp, #0x10]
-	bl sub_0205F09C
+	bl MapObject_GetPriorityPlusValue
 	add r1, sp, #8
 	str r1, [sp]
 	str r0, [sp, #4]

diff --git a/asm/overlay_01_021FD41C.s b/asm/overlay_01_021FD41C.s
@@ -333,7 +333,7 @@ ov01_021FD640: ; 0x021FD640
 	bl MapObject_GetPositionVec
 	add r0, r5, #0
 	mov r1, #2
-	bl sub_0205F09C
+	bl MapObject_GetPriorityPlusValue
 	add r1, sp, #0x14
 	str r1, [sp]
 	str r0, [sp, #4]
@@ -365,7 +365,7 @@ ov01_021FD684: ; 0x021FD684
 	bl MapObject_GetPositionVec
 	add r0, r5, #0
 	mov r1, #2
-	bl sub_0205F09C
+	bl MapObject_GetPriorityPlusValue
 	add r1, sp, #0x14
 	str r1, [sp]
 	str r0, [sp, #4]
@@ -673,7 +673,7 @@ ov01_021FD8E8: ; 0x021FD8E8
 	bl MapObject_GetPositionVec
 	add r0, r5, #0
 	mov r1, #2
-	bl sub_0205F09C
+	bl MapObject_GetPriorityPlusValue
 	add r1, sp, #0x14
 	str r1, [sp]
 	str r0, [sp, #4]

diff --git a/asm/overlay_01_021FDA14.s b/asm/overlay_01_021FDA14.s
@@ -90,7 +90,7 @@ ov01_021FDA74: ; 0x021FDA74
 	bl MapObject_GetPositionVec
 	add r0, r5, #0
 	mov r1, #2
-	bl sub_0205F09C
+	bl MapObject_GetPriorityPlusValue
 	add r1, sp, #8
 	str r1, [sp]
 	str r0, [sp, #4]
@@ -740,7 +740,7 @@ ov01_021FDF88: ; 0x021FDF88
 	bl MapObject_GetPositionVec
 	add r0, r5, #0
 	mov r1, #2
-	bl sub_0205F09C
+	bl MapObject_GetPriorityPlusValue
 	add r1, sp, #8
 	str r1, [sp]
 	str r0, [sp, #4]

diff --git a/asm/overlay_01_021FE200.s b/asm/overlay_01_021FE200.s
@@ -327,7 +327,7 @@ ov01_021FE3F8: ; 0x021FE3F8
 	str r0, [sp, #0x18]
 	add r0, r5, #0
 	mov r1, #2
-	bl sub_0205F09C
+	bl MapObject_GetPriorityPlusValue
 	add r7, r0, #0
 	add r0, r5, #0
 	bl ov01_021F146C

diff --git a/asm/overlay_01_021FE780.s b/asm/overlay_01_021FE780.s
@@ -120,7 +120,7 @@ _021FE826:
 _021FE842:
 	add r0, r5, #0
 	mov r1, #2
-	bl sub_0205F09C
+	bl MapObject_GetPriorityPlusValue
 	add r1, sp, #0x20
 	str r1, [sp]
 	str r0, [sp, #4]

diff --git a/asm/overlay_01_021FEA0C.s b/asm/overlay_01_021FEA0C.s
@@ -172,7 +172,7 @@ _021FEB06:
 _021FEB0E:
 	add r0, r5, #0
 	mov r1, #2
-	bl sub_0205F09C
+	bl MapObject_GetPriorityPlusValue
 	add r1, sp, #0x18
 	str r1, [sp]
 	str r0, [sp, #4]

diff --git a/asm/overlay_01_021FEC38.s b/asm/overlay_01_021FEC38.s
@@ -113,7 +113,7 @@ ov01_021FECA0: ; 0x021FECA0
 	str r0, [sp, #0x14]
 	add r0, r5, #0
 	mov r1, #2
-	bl sub_0205F09C
+	bl MapObject_GetPriorityPlusValue
 	add r1, sp, #8
 	str r1, [sp]
 	str r0, [sp, #4]

diff --git a/asm/overlay_01_021FED9C.s b/asm/overlay_01_021FED9C.s
@@ -104,7 +104,7 @@ ov01_021FEE04: ; 0x021FEE04
 	str r0, [sp, #0x14]
 	add r0, r5, #0
 	mov r1, #2
-	bl sub_0205F09C
+	bl MapObject_GetPriorityPlusValue
 	add r1, sp, #8
 	str r1, [sp]
 	str r0, [sp, #4]

diff --git a/asm/overlay_01_021FEEEC.s b/asm/overlay_01_021FEEEC.s
@@ -227,7 +227,7 @@ ov01_021FF070: ; 0x021FF070
 	bl MapObject_GetPositionVec
 	add r0, r5, #0
 	mov r1, #2
-	bl sub_0205F09C
+	bl MapObject_GetPriorityPlusValue
 	add r1, sp, #8
 	str r1, [sp]
 	str r0, [sp, #4]
@@ -295,7 +295,7 @@ _021FF134:
 	bl MapObject_GetPositionVec
 	add r0, r5, #0
 	mov r1, #2
-	bl sub_0205F09C
+	bl MapObject_GetPriorityPlusValue
 	add r1, sp, #0xc
 	str r1, [sp]
 	str r0, [sp, #4]

diff --git a/asm/overlay_01_021FF464.s b/asm/overlay_01_021FF464.s
@@ -118,7 +118,7 @@ ov01_021FF4FC: ; 0x021FF4FC
 	add r0, r5, #0
 	mov r1, #2
 	str r5, [sp, #0x20]
-	bl sub_0205F09C
+	bl MapObject_GetPriorityPlusValue
 	add r1, sp, #0x14
 	str r1, [sp]
 	str r0, [sp, #4]

diff --git a/asm/overlay_01_021FF6B0.s b/asm/overlay_01_021FF6B0.s
@@ -125,7 +125,7 @@ ov01_021FF74C: ; 0x021FF74C
 	bl sub_020611C8
 	add r0, r5, #0
 	mov r1, #2
-	bl sub_0205F09C
+	bl MapObject_GetPriorityPlusValue
 	add r1, sp, #0x14
 	str r1, [sp]
 	str r0, [sp, #4]

diff --git a/asm/overlay_01_021FF854.s b/asm/overlay_01_021FF854.s
@@ -133,7 +133,7 @@ ov01_021FF8F0: ; 0x021FF8F0
 	bl MapObject_GetPositionVec
 	add r0, r5, #0
 	mov r1, #2
-	bl sub_0205F09C
+	bl MapObject_GetPriorityPlusValue
 	add r1, sp, #8
 	str r1, [sp]
 	str r0, [sp, #4]
@@ -201,7 +201,7 @@ _021FF9B4:
 	bl MapObject_GetPositionVec
 	add r0, r5, #0
 	mov r1, #2
-	bl sub_0205F09C
+	bl MapObject_GetPriorityPlusValue
 	add r1, sp, #0xc
 	str r1, [sp]
 	str r0, [sp, #4]

diff --git a/asm/overlay_01_02200040.s b/asm/overlay_01_02200040.s
@@ -125,7 +125,7 @@ ov01_022000DC: ; 0x022000DC
 	bl sub_020611C8
 	add r0, r5, #0
 	mov r1, #2
-	bl sub_0205F09C
+	bl MapObject_GetPriorityPlusValue
 	add r1, sp, #0x14
 	str r1, [sp]
 	str r0, [sp, #4]

diff --git a/asm/overlay_01_022001E4.s b/asm/overlay_01_022001E4.s
@@ -534,7 +534,7 @@ ov01_02200540: ; 0x02200540
 	add r2, r0, #0
 	bl VEC_Add
 	add r0, r5, #0
-	bl sub_0205F538
+	bl MapObject_GetPriority
 	add r1, r0, #1
 	add r0, sp, #0x20
 	str r0, [sp]

diff --git a/asm/overlay_01_022006A8.s b/asm/overlay_01_022006A8.s
@@ -110,7 +110,7 @@ ov01_02200730: ; 0x02200730
 	add r0, r5, #0
 	mov r1, #2
 	str r5, [sp, #0x20]
-	bl sub_0205F09C
+	bl MapObject_GetPriorityPlusValue
 	add r1, sp, #0x14
 	str r1, [sp]
 	str r0, [sp, #4]

diff --git a/asm/overlay_01_02200858.s b/asm/overlay_01_02200858.s
@@ -90,7 +90,7 @@ ov01_022008B4: ; 0x022008B4
 	add r0, r4, #0
 	mov r1, #2
 	str r5, [sp, #0x1c]
-	bl sub_0205F09C
+	bl MapObject_GetPriorityPlusValue
 	add r1, sp, #0x14
 	str r1, [sp]
 	str r0, [sp, #4]