Supported EU syncing to pmdsky-debug

pret · Nov 22, 2023 · d564ca9 · d564ca9
1 parent 82bd336
commit d564ca9
Show file tree

Hide file tree

Showing 20 changed files with 376 additions and 249 deletions.
diff --git a/asm/include/overlay_01.inc b/asm/include/overlay_01.inc
@@ -63,7 +63,7 @@
 .public GetTeamMember
 .public GetVictoriesOnOneFloor
 .public InitAnimationControl
-.public InitAnimationControlWithSet__0201C14C
+.public InitAnimationControlWithSet__0201C0B0
 .public InitPreprocessorArgs
 .public IsAdvancedMenuActive
 .public IsAdventureLogNotEmpty

diff --git a/asm/include/overlay_10.inc b/asm/include/overlay_10.inc
@@ -175,7 +175,7 @@
 .public HandleSir0Translation
 .public HidePortraitBox
 .public IncrementNbFriendRescues
-.public InitAnimationControlWithSet__0201C14C
+.public InitAnimationControlWithSet__0201C0B0
 .public InitEventFlagScriptVars
 .public InitPortraitBox
 .public InitPortraitBoxWithMonsterId

diff --git a/asm/include/overlay_11.inc b/asm/include/overlay_11.inc
@@ -122,7 +122,7 @@
 .public IncrementNbBigTreasureWins
 .public IncrementNbDungeonsCleared
 .public IncrementNbSkyGiftsSent
-.public InitAnimationControlWithSet__0201C14C
+.public InitAnimationControlWithSet__0201C0B0
 .public InitBulkItem
 .public InitMainTeamAfterQuiz
 .public InitMove
@@ -306,7 +306,6 @@
 .public SaveScriptVariableValue
 .public SaveScriptVariableValueAtIndex
 .public SaveScriptVariableValueBytes
-.public SendAudioCommandWrapperVeneer
 .public SentryRunState
 .public SetActorTalkMain
 .public SetActorTalkMainAndActorTalkSub
@@ -443,6 +442,7 @@
 .public sub_02017AB0
 .public sub_02017ACC
 .public sub_02017B18
+.public sub_02017B64
 .public sub_02017B70
 .public sub_02017B7C
 .public sub_02017B88

diff --git a/asm/include/overlay_29_022E0378.inc b/asm/include/overlay_29_022E0378.inc
@@ -22,7 +22,7 @@
 .public GetTileSafe
 .public HandleFaint
 .public HandleSir0Translation
-.public InitAnimationControlWithSet__0201C168
+.public InitAnimationControlWithSet__0201C0CC
 .public IsCurrentTilesetBackground
 .public IsExperienceLocked
 .public IsFloorOver

diff --git a/asm/include/overlay_29_022EAB50.inc b/asm/include/overlay_29_022EAB50.inc
@@ -61,7 +61,6 @@
 .public RemoveItem
 .public RoundUpDiv256
 .public RunMonsterAi
-.public SendAudioCommandWrapperVeneer
 .public SetItemAcquired
 .public SetLeaderAction
 .public ShouldDisplayEntityWrapper
@@ -72,6 +71,7 @@
 .public sub_0200D208
 .public sub_02017ACC
 .public sub_02017B18
+.public sub_02017B64
 .public sub_02017B70
 .public sub_02017B7C
 .public sub_02017C50

diff --git a/asm/include/overlay_29_022F7388.inc b/asm/include/overlay_29_022F7388.inc
@@ -92,7 +92,7 @@
 .public GroundToDungeonMoveset
 .public HasHeldItem
 .public HasMaxGinsengBoost99
-.public InitAnimationControlWithSet__0201C168
+.public InitAnimationControlWithSet__0201C0CC
 .public InitMoveCheckId
 .public InitTeamMember
 .public IQ_SKILLS

diff --git a/asm/main_0200C4CC.s b/asm/main_0200C4CC.s
@@ -13850,7 +13850,7 @@ sub_02016EAC: ; 0x02016EAC
 	ldr r0, _0201712C ; =_020AF760
 	ldr r0, [r0, #8]
 	add r0, r0, #0x98
-	bl InitAnimationControlWithSet__0201C14C
+	bl InitAnimationControlWithSet__0201C0B0
 	ldr r0, _0201712C ; =_020AF760
 	ldr r1, [r0, #8]
 	add r0, r1, #0x98
@@ -13889,7 +13889,7 @@ _02016FB0:
 	mov r0, #0x7c
 	mla r8, sb, r0, r6
 	mov r0, r8
-	bl InitAnimationControlWithSet__0201C14C
+	bl InitAnimationControlWithSet__0201C0B0
 	ldrsh r1, [r7, #0x94]
 	mov r0, r8
 	bl SetSpriteIdForAnimationControl
@@ -13931,7 +13931,7 @@ _02017054:
 	mov r0, #0x7c
 	mla r8, sb, r0, r6
 	mov r0, r8
-	bl InitAnimationControlWithSet__0201C14C
+	bl InitAnimationControlWithSet__0201C0B0
 	ldrsh r1, [r7, #0x96]
 	mov r0, r8
 	bl SetSpriteIdForAnimationControl
@@ -14849,13 +14849,13 @@ PlayBgmByIdVeneer: ; 0x02017B58
 _02017B60: .word PlayBgmById
 	arm_func_end PlayBgmByIdVeneer
 
-	arm_func_start SendAudioCommandWrapperVeneer
-SendAudioCommandWrapperVeneer: ; 0x02017B64
-	ldr ip, _02017B6C ; =SendAudioCommandWrapper
+	arm_func_start sub_02017B64
+sub_02017B64: ; 0x02017B64
+	ldr ip, _02017B6C ; =sub_02017E70
 	bx ip
 	.align 2, 0
-_02017B6C: .word SendAudioCommandWrapper
-	arm_func_end SendAudioCommandWrapperVeneer
+_02017B6C: .word sub_02017E70
+	arm_func_end sub_02017B64
 
 	arm_func_start sub_02017B70
 sub_02017B70: ; 0x02017B70
@@ -15188,8 +15188,8 @@ _02017E68: .word 0x000003E7
 _02017E6C: .word _022A4BEC
 	arm_func_end PlayBgmById
 
-	arm_func_start SendAudioCommandWrapper
-SendAudioCommandWrapper: ; 0x02017E70
+	arm_func_start sub_02017E70
+sub_02017E70: ; 0x02017E70
 	stmdb sp!, {r3, r4, r5, r6, r7, lr}
 	ldr r3, _02017EE0 ; =0x000003E7
 	mov r6, r0
@@ -15221,7 +15221,7 @@ SendAudioCommandWrapper: ; 0x02017E70
 	.align 2, 0
 _02017EE0: .word 0x000003E7
 _02017EE4: .word _022A4BEC
-	arm_func_end SendAudioCommandWrapper
+	arm_func_end sub_02017E70
 
 	arm_func_start StopBgmCommand
 StopBgmCommand: ; 0x02017EE8
@@ -20245,27 +20245,27 @@ InitAnimationControl: ; 0x0201C050
 	ldmia sp!, {r4, pc}
 	arm_func_end InitAnimationControl
 
-	arm_func_start InitAnimationControlWithSet__0201C14C
-InitAnimationControlWithSet__0201C14C: ; 0x0201C0B0
+	arm_func_start InitAnimationControlWithSet__0201C0B0
+InitAnimationControlWithSet__0201C0B0: ; 0x0201C0B0
 	stmdb sp!, {r4, lr}
 	mov r4, r0
 	bl InitAnimationControl
 	ldrh r0, [r4, #2]
 	orr r0, r0, #1
 	strh r0, [r4, #2]
 	ldmia sp!, {r4, pc}
-	arm_func_end InitAnimationControlWithSet__0201C14C
+	arm_func_end InitAnimationControlWithSet__0201C0B0
 
-	arm_func_start InitAnimationControlWithSet__0201C168
-InitAnimationControlWithSet__0201C168: ; 0x0201C0CC
+	arm_func_start InitAnimationControlWithSet__0201C0CC
+InitAnimationControlWithSet__0201C0CC: ; 0x0201C0CC
 	stmdb sp!, {r4, lr}
 	mov r4, r0
 	bl InitAnimationControl
 	ldrh r0, [r4, #2]
 	orr r0, r0, #1
 	strh r0, [r4, #2]
 	ldmia sp!, {r4, pc}
-	arm_func_end InitAnimationControlWithSet__0201C168
+	arm_func_end InitAnimationControlWithSet__0201C0CC
 
 	arm_func_start SetSpriteIdForAnimationControl
 SetSpriteIdForAnimationControl: ; 0x0201C0E8
@@ -37230,7 +37230,7 @@ LoadCursors: ; 0x0202950C
 	mov r2, #0xe
 	bl sub_0201D9C8
 	ldr r0, _02029668 ; =_022AAC80
-	bl InitAnimationControlWithSet__0201C14C
+	bl InitAnimationControlWithSet__0201C0B0
 	ldr r0, _02029668 ; =_022AAC80
 	ldr r1, _02029660 ; =_022AAC64
 	ldrsh r1, [r1, #2]
@@ -37252,7 +37252,7 @@ LoadCursors: ; 0x0202950C
 	strh r1, [r0, #0x38]
 	bl sub_0201C108
 	ldr r0, _0202966C ; =_022AACFC
-	bl InitAnimationControlWithSet__0201C14C
+	bl InitAnimationControlWithSet__0201C0B0
 	ldr r0, _0202966C ; =_022AACFC
 	ldr r1, _02029660 ; =_022AAC64
 	ldrsh r1, [r1]
@@ -37922,7 +37922,7 @@ LoadAlert: ; 0x02029EE8
 	ldr r1, _02029F7C ; =_022AAD78
 	strh r0, [r1]
 	ldr r0, _02029F80 ; =_022AAD7C
-	bl InitAnimationControlWithSet__0201C14C
+	bl InitAnimationControlWithSet__0201C0B0
 	ldr r1, _02029F7C ; =_022AAD78
 	ldr r0, _02029F80 ; =_022AAD7C
 	ldrsh r1, [r1]
@@ -117777,7 +117777,7 @@ _0206B328:
 	mov r0, #0x7c
 	mla r6, r5, r0, fp
 	mov r0, r6
-	bl InitAnimationControlWithSet__0201C14C
+	bl InitAnimationControlWithSet__0201C0B0
 	ldrsh r1, [r4, #0x18]
 	mov r0, r6
 	bl SetSpriteIdForAnimationControl

diff --git a/asm/overlay_01.s b/asm/overlay_01.s
@@ -3685,7 +3685,7 @@ ov01_0232C148: ; 0x0232C148
 	ldr r0, _0232C1CC ; =ov01_0233C800
 	mov r4, r1
 	mov r6, r2
-	bl InitAnimationControlWithSet__0201C14C
+	bl InitAnimationControlWithSet__0201C0B0
 	ldr r1, _0232C1D0 ; =ov01_0233C780
 	ldr r0, _0232C1CC ; =ov01_0233C800
 	ldrsh r1, [r1]
@@ -3873,7 +3873,7 @@ ov01_0232C3AC: ; 0x0232C3AC
 	ldr r0, _0232C448 ; =ov01_0233C8FC
 	mov r4, r1
 	mov r6, r3
-	bl InitAnimationControlWithSet__0201C14C
+	bl InitAnimationControlWithSet__0201C0B0
 	ldr r1, _0232C44C ; =ov01_0233C87C
 	ldr r0, _0232C448 ; =ov01_0233C8FC
 	ldrsh r1, [r1]
@@ -8589,7 +8589,7 @@ ov01_02330224: ; 0x02330224
 	strh r1, [r2, #0x8e]
 	ldr r0, [r0]
 	add r0, r0, #0x94
-	bl InitAnimationControlWithSet__0201C14C
+	bl InitAnimationControlWithSet__0201C0B0
 	ldr r0, _02330584 ; =ov01_0233C164
 	ldr r2, [r0]
 	ldrh r1, [r2, #0x96]
@@ -8628,7 +8628,7 @@ ov01_02330224: ; 0x02330224
 	strh r2, [r1, #0xcc]
 	ldr r0, [r0]
 	add r0, r0, #0x110
-	bl InitAnimationControlWithSet__0201C14C
+	bl InitAnimationControlWithSet__0201C0B0
 	ldr r1, _02330584 ; =ov01_0233C164
 	ldr r0, [r1]
 	add r0, r0, #0x100
@@ -8672,7 +8672,7 @@ ov01_02330224: ; 0x02330224
 	strh r2, [r0, #0x48]
 	ldr r0, [r1]
 	add r0, r0, #0x18c
-	bl InitAnimationControlWithSet__0201C14C
+	bl InitAnimationControlWithSet__0201C0B0
 	ldr r1, _02330584 ; =ov01_0233C164
 	ldr r0, [r1]
 	add r0, r0, #0x100
@@ -8715,7 +8715,7 @@ ov01_02330224: ; 0x02330224
 	strh r2, [r0, #0xc4]
 	ldr r0, [r1]
 	add r0, r0, #0x208
-	bl InitAnimationControlWithSet__0201C14C
+	bl InitAnimationControlWithSet__0201C0B0
 	ldr r0, _02330584 ; =ov01_0233C164
 	ldr r0, [r0]
 	ldrsh r1, [r0, #0x92]
@@ -9477,7 +9477,7 @@ _02330F18:
 	moveq r0, #0
 	beq _02330FDC
 	ldr r0, _02330FF8 ; =ov01_0233C978
-	bl InitAnimationControlWithSet__0201C14C
+	bl InitAnimationControlWithSet__0201C0B0
 	ldr r1, _02330FE4 ; =ov01_0233C174
 	ldr r0, _02330FF8 ; =ov01_0233C978
 	ldrsh r1, [r1, #2]

diff --git a/asm/overlay_09.s b/asm/overlay_09.s
@@ -3096,6 +3096,7 @@ _0233F548:
 _0233F564:
 	add sp, sp, #0x2c
 	ldmia sp!, {r3, r4, r5, r6, pc}
+	arm_func_end UpdateInputLockBox
 	; 0x0233F56C
 
 	.global ov09_0233F56C

diff --git a/asm/overlay_10.s b/asm/overlay_10.s
@@ -1807,7 +1807,7 @@ _022BE200: ; jump table
 	b _022BE418 ; case 6
 _022BE21C:
 	add r0, r7, #0x68
-	bl InitAnimationControlWithSet__0201C14C
+	bl InitAnimationControlWithSet__0201C0B0
 	ldrsh r1, [r7, #0x64]
 	add r0, r7, #0x68
 	bl SetSpriteIdForAnimationControl
@@ -1833,7 +1833,7 @@ _022BE21C:
 	b _022BE440
 _022BE280:
 	add r0, r7, #0x68
-	bl InitAnimationControlWithSet__0201C14C
+	bl InitAnimationControlWithSet__0201C0B0
 	ldrsh r1, [r7, #0x64]
 	add r0, r7, #0x68
 	bl SetSpriteIdForAnimationControl
@@ -1866,7 +1866,7 @@ _022BE280:
 	b _022BE440
 _022BE300:
 	add r0, r7, #0x68
-	bl InitAnimationControlWithSet__0201C14C
+	bl InitAnimationControlWithSet__0201C0B0
 	ldrsh r1, [r7, #0x64]
 	add r0, r7, #0x68
 	bl SetSpriteIdForAnimationControl
@@ -1894,7 +1894,7 @@ _022BE300:
 	b _022BE440
 _022BE36C:
 	add r0, r7, #0x68
-	bl InitAnimationControlWithSet__0201C14C
+	bl InitAnimationControlWithSet__0201C0B0
 	ldrsh r1, [r7, #0x64]
 	add r0, r7, #0x68
 	bl SetSpriteIdForAnimationControl
@@ -4813,7 +4813,7 @@ _022C08D4:
 	ldr r0, [r4]
 	add r0, r0, #0x88
 	mla r0, r6, sb, r0
-	bl InitAnimationControlWithSet__0201C14C
+	bl InitAnimationControlWithSet__0201C0B0
 	add r0, r6, #1
 	ldr r1, [r4]
 	mov r0, r0, lsl #0x10
@@ -4918,7 +4918,7 @@ ov10_022C09E8: ; 0x022C09E8
 	strh r0, [r2, #4]
 	ldr r0, [r1]
 	add r0, r0, #8
-	bl InitAnimationControlWithSet__0201C14C
+	bl InitAnimationControlWithSet__0201C0B0
 	ldr r0, _022C0CC0 ; =ov10_022DC1D0
 	ldr r0, [r0]
 	ldrsh r1, [r0, #4]

diff --git a/asm/overlay_11.s b/asm/overlay_11.s
@@ -6761,7 +6761,7 @@ _022E20D0:
 	mov r2, r3, lsl #0x10
 	mov r1, r1, lsr #0x10
 	mov r2, r2, lsr #0x10
-	bl SendAudioCommandWrapperVeneer
+	bl sub_02017B64
 	b _022E2464
 _022E2120:
 	bl sub_02017B70
@@ -29166,7 +29166,7 @@ _022F4A38:
 	mov r1, #0xff
 	add r0, r4, #0xc
 	strb r1, [r4, #0xa4]
-	bl InitAnimationControlWithSet__0201C14C
+	bl InitAnimationControlWithSet__0201C0B0
 	mov r0, #0
 	strb r0, [r4, #0x8a]
 	strh r0, [r4, #0x8c]
@@ -29211,7 +29211,7 @@ ov11_022F4AB8: ; 0x022F4AB8
 	strh r1, [r6, #0xb2]
 	add r0, r6, #0xc
 	strh r1, [r6, #0xb4]
-	bl InitAnimationControlWithSet__0201C14C
+	bl InitAnimationControlWithSet__0201C0B0
 	mov r1, #0
 	strh r1, [r6, #0x8c]
 	strh r1, [r6, #0x8e]

diff --git a/asm/overlay_29_022E0378.s b/asm/overlay_29_022E0378.s
@@ -1522,7 +1522,7 @@ _022E1658:
 	add r0, r0, #0x12000
 	ldr r0, [r0, #0xb28]
 	add r0, r0, #0x2c
-	bl InitAnimationControlWithSet__0201C168
+	bl InitAnimationControlWithSet__0201C0CC
 	ldr r0, [r4]
 	add r0, r0, r6, lsl #2
 	add r0, r0, #0x12000
@@ -1560,7 +1560,7 @@ _022E16E8:
 	add r0, r0, #0x12000
 	ldr r0, [r0, #0xb38]
 	add r0, r0, #0x2c
-	bl InitAnimationControlWithSet__0201C168
+	bl InitAnimationControlWithSet__0201C0CC
 	ldr r0, [r4]
 	add r0, r0, r7, lsl #2
 	add r0, r0, #0x12000

diff --git a/asm/overlay_29_022EAB50.s b/asm/overlay_29_022EAB50.s
@@ -474,7 +474,7 @@ _022EB0D4:
 	ldrh r1, [r4, #8]
 	mov r0, r0, lsr #0x10
 	mov r2, #0x100
-	bl SendAudioCommandWrapperVeneer
+	bl sub_02017B64
 _022EB0EC:
 	ldrh r1, [r4, #0xa]
 	mov r0, #4