some more map object decomp

pret · Oct 28, 2024 · 88b4dd8 · 88b4dd8
1 parent d86106a
commit 88b4dd8
Show file tree

Hide file tree

Showing 13 changed files with 207 additions and 291 deletions.
diff --git a/arm9/asm/map_object_s.s b/arm9/asm/map_object_s.s
@@ -9,202 +9,13 @@
 	.extern MapObjectManager_ClearFlagsBits
 	.extern MapObjectManager_GetFlagsBitsMask
 	.extern MapObjectManager_GetObjects
-	.extern MapObjectManager_GetFieldSystem
 	.extern MapObject_SetMovement
 	.extern MapObject_GetEventFlag
 	.extern sub_0205855C
-	.extern MapObject_GetManagerFromManager
 	.extern sub_02058660
 
 	.text
 
-	thumb_func_start sub_0205866C
-sub_0205866C: ; 0x0205866C
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl MapObject_GetMovement
-	bl sub_02058D14
-	add r1, r0, #0x0
-	ldr r1, [r1, #0x10]
-	add r0, r4, #0x0
-	blx r1
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start sub_02058684
-sub_02058684: ; 0x02058684
-	add r0, #0xc4
-	str r1, [r0, #0x0]
-	bx lr
-	.balign 4
-
-	thumb_func_start sub_0205868C
-sub_0205868C: ; 0x0205868C
-	push {r3, lr}
-	add r1, r0, #0x0
-	add r1, #0xc4
-	ldr r1, [r1, #0x0]
-	blx r1
-	pop {r3, pc}
-
-	thumb_func_start sub_02058698
-sub_02058698: ; 0x02058698
-	add r0, #0xc8
-	str r1, [r0, #0x0]
-	bx lr
-	.balign 4
-
-	thumb_func_start sub_020586A0
-sub_020586A0: ; 0x020586A0
-	push {r3, lr}
-	add r1, r0, #0x0
-	add r1, #0xc8
-	ldr r1, [r1, #0x0]
-	blx r1
-	pop {r3, pc}
-
-	thumb_func_start sub_020586AC
-sub_020586AC: ; 0x020586AC
-	add r0, #0xcc
-	str r1, [r0, #0x0]
-	bx lr
-	.balign 4
-
-	thumb_func_start sub_020586B4
-sub_020586B4: ; 0x020586B4
-	push {r3, lr}
-	add r1, r0, #0x0
-	add r1, #0xcc
-	ldr r1, [r1, #0x0]
-	blx r1
-	pop {r3, pc}
-
-	thumb_func_start sub_020586C0
-sub_020586C0: ; 0x020586C0
-	add r0, #0xd0
-	str r1, [r0, #0x0]
-	bx lr
-	.balign 4
-
-	thumb_func_start sub_020586C8
-sub_020586C8: ; 0x020586C8
-	push {r3, lr}
-	add r1, r0, #0x0
-	add r1, #0xd0
-	ldr r1, [r1, #0x0]
-	blx r1
-	pop {r3, pc}
-
-	thumb_func_start sub_020586D4
-sub_020586D4: ; 0x020586D4
-	add r0, #0xd4
-	str r1, [r0, #0x0]
-	bx lr
-	.balign 4
-
-	thumb_func_start sub_020586DC
-sub_020586DC: ; 0x020586DC
-	push {r3, lr}
-	add r1, r0, #0x0
-	add r1, #0xd4
-	ldr r1, [r1, #0x0]
-	blx r1
-	pop {r3, pc}
-
-	thumb_func_start sub_020586E8
-sub_020586E8: ; 0x020586E8
-	add r0, #0xa4
-	str r1, [r0, #0x0]
-	bx lr
-	.balign 4
-
-	thumb_func_start sub_020586F0
-sub_020586F0: ; 0x020586F0
-	add r0, #0xa4
-	ldr r0, [r0, #0x0]
-	bx lr
-	.balign 4
-
-	thumb_func_start sub_020586F8
-sub_020586F8: ; 0x020586F8
-	add r0, #0xa8
-	str r1, [r0, #0x0]
-	bx lr
-	.balign 4
-
-	thumb_func_start sub_02058700
-sub_02058700: ; 0x02058700
-	add r1, r0, #0x0
-	add r1, #0xa8
-	ldr r1, [r1, #0x0]
-	add r0, #0xa8
-	add r1, r1, #0x1
-	str r1, [r0, #0x0]
-	bx lr
-	.balign 4
-
-	thumb_func_start sub_02058710
-sub_02058710: ; 0x02058710
-	add r0, #0xa8
-	ldr r0, [r0, #0x0]
-	bx lr
-	.balign 4
-
-	thumb_func_start sub_02058718
-sub_02058718: ; 0x02058718
-	add r0, #0xac
-	strh r1, [r0, #0x0]
-	bx lr
-	.balign 4
-
-	thumb_func_start sub_02058720
-sub_02058720: ; 0x02058720
-	add r0, #0xac
-	ldrh r0, [r0, #0x0]
-	bx lr
-	.balign 4
-
-	thumb_func_start sub_02058728
-sub_02058728: ; 0x02058728
-	add r0, #0xae
-	strh r1, [r0, #0x0]
-	bx lr
-	.balign 4
-
-	thumb_func_start sub_02058730
-sub_02058730: ; 0x02058730
-	add r0, #0xae
-	ldrh r0, [r0, #0x0]
-	bx lr
-	.balign 4
-
-	thumb_func_start MapObject_GetFieldSystem
-MapObject_GetFieldSystem: ; 0x02058738
-	push {r3, lr}
-	bl MapObject_GetManagerFromManager
-	bl MapObjectManager_GetFieldSystem
-	pop {r3, pc}
-
-	thumb_func_start sub_02058744
-sub_02058744: ; 0x02058744
-	push {r3, lr}
-	bl MapObject_GetManager
-	bl MapObjectManager_GetPriority
-	pop {r3, pc}
-
-	thumb_func_start sub_02058750
-sub_02058750: ; 0x02058750
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl MapObject_CheckFlag25
-	cmp r0, #0x1
-	beq _02058760
-	bl GF_AssertFail
-_02058760:
-	add r0, r4, #0x0
-	bl MapObject_GetEventFlag
-	pop {r4, pc}
-
 	thumb_func_start sub_02058768
 sub_02058768: ; 0x02058768
 	ldr r3, _02058770 ; =MapObjectManager_SetFlagsBits

diff --git a/arm9/asm/unk_020557F4.s b/arm9/asm/unk_020557F4.s
@@ -122,7 +122,7 @@ _020558B8:
 	pop {r4-r6, pc}
 _020558C4:
 	add r0, r6, #0x0
-	bl sub_020586F0
+	bl MapObject_GetMovementCommand
 	bl sub_020570F0
 	cmp r0, #0x1
 	bne _020558FA
@@ -213,7 +213,7 @@ sub_02055968: ; 0x02055968
 	lsl r0, r0, #0x18
 	lsr r5, r0, #0x18
 	add r0, r4, #0x0
-	bl sub_020586F0
+	bl MapObject_GetMovementCommand
 	bl sub_0205B020
 	add r1, r0, #0x0
 	mov r0, #0x0
@@ -264,7 +264,7 @@ _020559D8:
 	bl PlaySE
 _020559F8:
 	add r0, r4, #0x0
-	bl sub_020586F0
+	bl MapObject_GetMovementCommand
 	bl sub_020570F0
 	cmp r0, #0x0
 	bne _02055A20
@@ -329,7 +329,7 @@ _02055A76:
 	pop {r3-r7, pc}
 _02055A8E:
 	add r0, r7, #0x0
-	bl sub_020586F0
+	bl MapObject_GetMovementCommand
 	bl sub_020570F0
 	cmp r0, #0x1
 	beq _02055B10
@@ -447,7 +447,7 @@ _02055B60:
 	pop {r3-r5, pc}
 _02055B74:
 	add r0, r4, #0x0
-	bl sub_020586F0
+	bl MapObject_GetMovementCommand
 	bl sub_020570F0
 	cmp r0, #0x1
 	bne _02055B86
@@ -3123,7 +3123,7 @@ sub_020570C4: ; 0x020570C4
 	pop {r4, pc}
 _020570D8:
 	add r0, r4, #0x0
-	bl sub_020586F0
+	bl MapObject_GetMovementCommand
 	bl sub_020570F0
 	cmp r0, #0x1
 	bne _020570EA