more map_object decomp

pret · Nov 4, 2024 · ddbc74f · ddbc74f
1 parent 88b4dd8
commit ddbc74f
Show file tree

Hide file tree

Showing 28 changed files with 716 additions and 1,016 deletions.
diff --git a/arm9/asm/map_object_s.s b/arm9/asm/map_object_s.s
diff --git a/arm9/asm/unk_02037024.s b/arm9/asm/unk_02037024.s
@@ -71,7 +71,7 @@ sub_02037090: ; 0x02037090
 	ldr r0, [r4, #0x0]
 	cmp r0, #0x0
 	beq _020370B8
-	bl sub_020588D4
+	bl MapObject_CheckFlag19Disabled
 	cmp r0, #0x1
 	bne _020370B8
 	ldr r0, [r5, #0x38]

diff --git a/arm9/asm/unk_0204B34C.s b/arm9/asm/unk_0204B34C.s
@@ -684,7 +684,7 @@ _0204B848:
 	bl Field_PlayerAvatar_ApplyTransitionFlags
 	ldr r0, [r5, #0x38]
 	bl PlayerAvatar_GetMapObject
-	bl sub_02058914
+	bl MapObject_UnpauseMovement
 	mov r0, #0x1
 	str r0, [r4, #0x0]
 	b _0204B98E
@@ -824,7 +824,7 @@ _0204B972:
 	bl sub_02055304
 	ldr r0, [r5, #0x38]
 	bl PlayerAvatar_GetMapObject
-	bl sub_02058908
+	bl MapObject_PauseMovement
 	add r0, r4, #0x0
 	bl FreeToHeap
 	mov r0, #0x1

diff --git a/arm9/asm/unk_0204CB20.s b/arm9/asm/unk_0204CB20.s
@@ -5970,7 +5970,7 @@ _0204F89E:
 	bl MapObject_SetCurrentX
 	ldr r0, [sp, #0xc]
 	add r1, r7, #0x0
-	bl MapObject_SetCurrentY
+	bl MapObject_SetCurrentZ
 	ldr r0, [sp, #0x4]
 	ldr r1, [sp, #0x8]
 	str r0, [sp, #0x0]

diff --git a/arm9/asm/unk_02052EE8.s b/arm9/asm/unk_02052EE8.s
@@ -478,7 +478,7 @@ _02053272:
 	bl sub_0205AE50
 	add r0, r5, #0x0
 	mov r1, #0x0
-	bl sub_020588EC
+	bl MapObject_SetFlag19
 	ldrb r0, [r4, #0xc]
 	cmp r0, #0x1
 	bne _020532A8
@@ -537,7 +537,7 @@ _020532DA:
 	bl MapObject_SetVisible
 	add r0, r5, #0x0
 	mov r1, #0x0
-	bl sub_020588B8
+	bl MapObject_ClearFlag18
 	b _0205330A
 _02053306:
 	mov r0, #0x0
@@ -633,10 +633,10 @@ sub_0205339C: ; 0x0205339C
 	bl MapObject_GetInitialX
 	add r7, r0, #0x0
 	add r0, r4, #0x0
-	bl MapObject_GetInitialHeight
+	bl MapObject_GetInitialY
 	str r0, [sp, #0xc]
 	add r0, r4, #0x0
-	bl MapObject_GetInitialY
+	bl MapObject_GetInitialZ
 	add r6, r0, #0x0
 	ldr r0, [sp, #0x4]
 	cmp r7, r0
@@ -671,7 +671,7 @@ _020533CC:
 	bl MapObject_SetVisible
 	add r0, r4, #0x0
 	mov r1, #0x1
-	bl sub_020588B8
+	bl MapObject_ClearFlag18
 	mov r1, #0x1
 	strb r1, [r5, #0x1]
 	ldrb r0, [r5, #0x2]
@@ -709,7 +709,7 @@ sub_02053444: ; 0x02053444
 	bl sub_0205ADDC
 	add r0, r5, #0x0
 	mov r1, #0x1
-	bl sub_020588EC
+	bl MapObject_SetFlag19
 	add r0, r5, #0x0
 	mov r1, #0x0
 	bl sub_02058E90
@@ -768,10 +768,10 @@ _020534BC:
 	bl MapObject_SetVisible
 	add r0, r4, #0x0
 	mov r1, #0x0
-	bl sub_020588B8
+	bl MapObject_ClearFlag18
 	add r0, r4, #0x0
 	mov r1, #0x1
-	bl sub_020588EC
+	bl MapObject_SetFlag19
 	add r5, r5, #0x1
 	cmp r5, r6
 	blt _020534AC
@@ -827,7 +827,7 @@ _02053524:
 	bl MapObject_SetVisible
 	add r0, r4, #0x0
 	mov r1, #0x1
-	bl sub_020588B8
+	bl MapObject_ClearFlag18
 	mov r0, #0x1
 	strb r0, [r5, #0x1]
 	ldrb r0, [r5, #0x2]

diff --git a/arm9/asm/unk_02053750.s b/arm9/asm/unk_02053750.s
@@ -96,7 +96,7 @@ _02053786:
 	ldr r0, [r4, #0x0]
 	ldr r0, [r0, #0x38]
 	bl PlayerAvatar_GetMapObject
-	bl sub_02058914
+	bl MapObject_UnpauseMovement
 	ldr r0, [r4, #0x0]
 	mov r1, #0x0
 	ldr r0, [r0, #0x38]

diff --git a/arm9/asm/unk_02055068.s b/arm9/asm/unk_02055068.s
@@ -67,7 +67,7 @@ sub_020550A4: ; 0x020550A4
 	bl MapObject_ClearFlagsBits
 	add r0, r4, #0x0
 	mov r1, #0x1
-	bl sub_02058AC8
+	bl MapObject_SetFlag29
 	add r0, r5, #0x0
 	add r1, r4, #0x0
 	bl sub_0205539C
@@ -252,7 +252,7 @@ _02055228:
 	bl MapObject_ClearFlagsBits
 	add r0, r5, #0x0
 	mov r1, #0x1
-	bl sub_02058AC8
+	bl MapObject_SetFlag29
 	add r0, r4, #0x0
 	add r1, r5, #0x0
 	bl sub_0205539C
@@ -340,21 +340,21 @@ GetPlayerXCoord: ; 0x02055320
 GetPlayerYCoord: ; 0x0205532C
 	push {r3, lr}
 	bl PlayerAvatar_GetMapObject
-	bl MapObject_GetCurrentY
+	bl MapObject_GetCurrentZ
 	pop {r3, pc}
 
 	thumb_func_start sub_02055338
 sub_02055338: ; 0x02055338
 	push {r3, lr}
 	bl PlayerAvatar_GetMapObject
-	bl sub_02058B14
+	bl MapObject_GetPreviousX
 	pop {r3, pc}
 
 	thumb_func_start sub_02055344
 sub_02055344: ; 0x02055344
 	push {r3, lr}
 	bl PlayerAvatar_GetMapObject
-	bl sub_02058B24
+	bl MapObject_GetPreviousZ
 	pop {r3, pc}
 
 	thumb_func_start sub_02055350
@@ -754,11 +754,11 @@ PlayerAvatar_ToggleAutomaticHeightUpdating: ; 0x02055560
 	cmp r4, #0x1
 	bne _02055574
 	mov r1, #0x0
-	bl sub_02058960
+	bl MapObject_SetIgnoreHeights
 	pop {r4, pc}
 _02055574:
 	mov r1, #0x1
-	bl sub_02058960
+	bl MapObject_SetIgnoreHeights
 	pop {r4, pc}
 
 	thumb_func_start sub_0205557C
@@ -770,13 +770,13 @@ sub_0205557C: ; 0x0205557C
 	cmp r5, #0x1
 	bne _02055598
 	mov r1, #0x0
-	bl sub_02058960
+	bl MapObject_SetIgnoreHeights
 	add r0, r4, #0x0
 	bl sub_02059D1C
 	pop {r3-r5, pc}
 _02055598:
 	mov r1, #0x1
-	bl sub_02058960
+	bl MapObject_SetIgnoreHeights
 	pop {r3-r5, pc}
 
 	thumb_func_start PlayerAvatar_GetSpriteByStateAndGender

diff --git a/arm9/asm/unk_020557F4.s b/arm9/asm/unk_020557F4.s
@@ -194,7 +194,7 @@ sub_02055928: ; 0x02055928
 	add r0, r4, #0x0
 	bl PlayerAvatar_GetMapObject
 	mov r1, #0x0
-	bl sub_02058A18
+	bl MapObject_SetFlag27
 _02055964:
 	pop {r4, pc}
 	.balign 4
@@ -2521,10 +2521,10 @@ sub_02056C0C: ; 0x02056C0C
 	bl sub_02059BF4
 	str r0, [sp, #0x14]
 	add r0, r5, #0x0
-	bl MapObject_GetCurrentHeight
+	bl MapObject_GetCurrentY
 	str r0, [sp, #0x8]
 	add r0, r5, #0x0
-	bl MapObject_GetCurrentY
+	bl MapObject_GetCurrentZ
 	str r0, [sp, #0xc]
 	ldr r0, [sp, #0x4]
 	bl sub_02059C00
@@ -2619,7 +2619,7 @@ sub_02056CCC: ; 0x02056CCC
 	bl sub_02059BF4
 	add r7, r0, #0x0
 	add r0, r5, #0x0
-	bl MapObject_GetCurrentY
+	bl MapObject_GetCurrentZ
 	add r5, r0, #0x0
 	add r0, r4, #0x0
 	bl sub_02059C00
@@ -2685,7 +2685,7 @@ sub_02056D58: ; 0x02056D58
 	bl MapObject_GetCurrentX
 	add r6, r0, #0x0
 	add r0, r5, #0x0
-	bl MapObject_GetCurrentY
+	bl MapObject_GetCurrentZ
 	str r0, [sp, #0x0]
 	ldr r2, [sp, #0x0]
 	add r0, r7, #0x0
@@ -2772,7 +2772,7 @@ sub_02056E04: ; 0x02056E04
 	bl sub_02059BF4
 	add r7, r0, #0x0
 	add r0, r4, #0x0
-	bl MapObject_GetCurrentY
+	bl MapObject_GetCurrentZ
 	add r4, r0, #0x0
 	add r0, r5, #0x0
 	bl sub_02059C00
@@ -2822,7 +2822,7 @@ sub_02056E6C: ; 0x02056E6C
 	bl sub_02059BF4
 	add r7, r0, #0x0
 	add r0, r5, #0x0
-	bl MapObject_GetCurrentY
+	bl MapObject_GetCurrentZ
 	str r0, [sp, #0x4]
 	add r0, r4, #0x0
 	bl sub_02059C00
@@ -2866,7 +2866,7 @@ sub_02056EC8: ; 0x02056EC8
 	bl sub_02059BF4
 	add r7, r0, #0x0
 	add r0, r5, #0x0
-	bl MapObject_GetCurrentY
+	bl MapObject_GetCurrentZ
 	str r0, [sp, #0x8]
 	add r0, r4, #0x0
 	bl sub_02059C00
@@ -2954,7 +2954,7 @@ sub_02056F78: ; 0x02056F78
 	bl sub_02059BF4
 	add r7, r0, #0x0
 	add r0, r5, #0x0
-	bl MapObject_GetCurrentY
+	bl MapObject_GetCurrentZ
 	str r0, [sp, #0x4]
 	add r0, r4, #0x0
 	bl sub_02059C00