sub_812B004 - sub_812B058

3 files changed, 139 insertions, 128 deletions

diff --git a/asm/battle_anim_sfx.s b/asm/battle_anim_sfx.s
index ef6a0181d..4e92cfcee 100644
--- a/asm/battle_anim_sfx.s
+++ b/asm/battle_anim_sfx.s
@@ -5,134 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_812B004
-sub_812B004: @ 812B004
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r1, _0812B054 @ =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r4, r0, r1
-	ldrh r0, [r4, 0x1C]
-	adds r0, 0x1
-	strh r0, [r4, 0x1C]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x6
-	bne _0812B04C
-	movs r0, 0
-	strh r0, [r4, 0x1C]
-	movs r0, 0x3F
-	bl BattleAnimAdjustPanning
-	adds r1, r0, 0
-	ldrh r0, [r4, 0xA]
-	lsls r1, 24
-	asrs r1, 24
-	bl PlaySE12WithPanning
-	ldrh r0, [r4, 0x1E]
-	adds r0, 0x1
-	strh r0, [r4, 0x1E]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x2
-	bne _0812B04C
-	adds r0, r5, 0
-	bl DestroyAnimSoundTask
-_0812B04C:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812B054: .4byte gTasks
-	thumb_func_end sub_812B004
-
-	thumb_func_start sub_812B058
-sub_812B058: @ 812B058
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	mov r8, r0
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	ldr r0, _0812B0FC @ =gBattleAnimArgs
-	ldrh r1, [r0]
-	str r1, [sp]
-	ldrb r5, [r0, 0x4]
-	ldrb r6, [r0, 0x6]
-	ldrb r3, [r0, 0x8]
-	mov r10, r3
-	ldrb r7, [r0, 0xA]
-	ldrb r1, [r0, 0xC]
-	mov r9, r1
-	ldrb r0, [r0, 0x2]
-	lsls r0, 24
-	asrs r0, 24
-	bl BattleAnimAdjustPanning
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r5, 24
-	asrs r5, 24
-	adds r0, r5, 0
-	bl BattleAnimAdjustPanning
-	adds r5, r0, 0
-	lsls r4, 24
-	asrs r4, 24
-	lsls r5, 24
-	asrs r5, 24
-	lsls r6, 24
-	asrs r6, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	adds r2, r6, 0
-	bl CalculatePanIncrement
-	ldr r2, _0812B100 @ =gTasks
-	mov r3, r8
-	lsls r1, r3, 2
-	add r1, r8
-	lsls r1, 3
-	adds r1, r2
-	movs r2, 0
-	mov r6, sp
-	ldrh r6, [r6]
-	strh r6, [r1, 0x8]
-	strh r4, [r1, 0xA]
-	strh r5, [r1, 0xC]
-	lsls r0, 24
-	asrs r0, 24
-	strh r0, [r1, 0xE]
-	mov r0, r10
-	strh r0, [r1, 0x10]
-	strh r7, [r1, 0x12]
-	mov r3, r9
-	strh r3, [r1, 0x14]
-	strh r2, [r1, 0x1C]
-	strh r4, [r1, 0x1E]
-	strh r3, [r1, 0x20]
-	ldr r2, _0812B104 @ =sub_812B108
-	str r2, [r1]
-	mov r0, r8
-	bl _call_via_r2
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812B0FC: .4byte gBattleAnimArgs
-_0812B100: .4byte gTasks
-_0812B104: .4byte sub_812B108
-	thumb_func_end sub_812B058
-
 	thumb_func_start sub_812B108
 sub_812B108: @ 812B108
 	push {r4,r5,lr}
diff --git a/include/battle_anim.h b/include/battle_anim.h
index 99167d7c6..7b966cf4c 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -62,5 +62,6 @@ s8 BattleAnimAdjustPanning(s8 a);
 void sub_80763FC(u16 a, u16 *b, u32 c, u8 d);
 s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan);
 s16 sub_8077104(s16 a);
+void DestroyAnimSoundTask(u8 taskId);
 
 #endif
diff --git a/src/battle/anim/sfx.c b/src/battle/anim/sfx.c
index a66a15371..e7e3c867e 100644
--- a/src/battle/anim/sfx.c
+++ b/src/battle/anim/sfx.c
@@ -8,6 +8,7 @@ extern s16 gBattleAnimArgs[];
 void sub_812AF98(u8 taskId);
 void sub_812B004(u8 taskId);
 void sub_812B004(u8 taskId);
+void sub_812B108(u8 taskId);
 
 void sub_812AF30(u8 taskId)
 {
@@ -113,3 +114,140 @@ _0812AFFE:\n\
 }
 #endif // NONMATCHING
 
+void sub_812B004(u8 taskId)
+{
+    s8 pan;
+
+    if (++TASK.data[10] == 6)
+    {
+        TASK.data[10] = 0;
+
+        pan = BattleAnimAdjustPanning(0x3f);
+        PlaySE12WithPanning(TASK.data[1], pan);
+
+        if (++TASK.data[11] == 2)
+        {
+            DestroyAnimSoundTask(taskId);
+        }
+    }
+}
+
+#ifdef NONMATCHING
+void sub_812B058(u8 taskId)
+{
+    s16 sp, r10, r7, r9;
+    s8 r5, r6, r4, r0;
+
+    sp = gBattleAnimArgs[0];
+    r5 = gBattleAnimArgs[2];
+    r6 = gBattleAnimArgs[3];
+    r10  = gBattleAnimArgs[4];
+    r7 = gBattleAnimArgs[5];
+    r9 = gBattleAnimArgs[6];
+    r4 = BattleAnimAdjustPanning(gBattleAnimArgs[1]);
+    r5 = BattleAnimAdjustPanning(r5);
+    r0 = CalculatePanIncrement(r4, r5, r6);
+
+    TASK.data[0] = sp;
+    TASK.data[1] = r4;
+    TASK.data[2] = r5;
+    TASK.data[3] = r0;
+    TASK.data[4] = r10;
+    TASK.data[5] = r7;
+    TASK.data[6] = r9;
+    TASK.data[10] = 0;
+    TASK.data[11] = r4;
+    TASK.data[12] = r9;
+
+    TASK.func = sub_812B108;
+    sub_812B108(taskId);
+}
+#else
+__attribute__((naked))
+void sub_812B058(u8 taskId)
+{
+    asm(".syntax unified\n\
+    push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0x4\n\
+    mov r8, r0\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    mov r8, r0\n\
+    ldr r0, _0812B0FC @ =gBattleAnimArgs\n\
+    ldrh r1, [r0]\n\
+    str r1, [sp]\n\
+    ldrb r5, [r0, 0x4]\n\
+    ldrb r6, [r0, 0x6]\n\
+    ldrb r3, [r0, 0x8]\n\
+    mov r10, r3\n\
+    ldrb r7, [r0, 0xA]\n\
+    ldrb r1, [r0, 0xC]\n\
+    mov r9, r1\n\
+    ldrb r0, [r0, 0x2]\n\
+    lsls r0, 24\n\
+    asrs r0, 24\n\
+    bl BattleAnimAdjustPanning\n\
+    adds r4, r0, 0\n\
+    lsls r4, 24\n\
+    lsrs r4, 24\n\
+    lsls r5, 24\n\
+    asrs r5, 24\n\
+    adds r0, r5, 0\n\
+    bl BattleAnimAdjustPanning\n\
+    adds r5, r0, 0\n\
+    lsls r4, 24\n\
+    asrs r4, 24\n\
+    lsls r5, 24\n\
+    asrs r5, 24\n\
+    lsls r6, 24\n\
+    asrs r6, 24\n\
+    adds r0, r4, 0\n\
+    adds r1, r5, 0\n\
+    adds r2, r6, 0\n\
+    bl CalculatePanIncrement\n\
+    ldr r2, _0812B100 @ =gTasks\n\
+    mov r3, r8\n\
+    lsls r1, r3, 2\n\
+    add r1, r8\n\
+    lsls r1, 3\n\
+    adds r1, r2\n\
+    movs r2, 0\n\
+    mov r6, sp\n\
+    ldrh r6, [r6]\n\
+    strh r6, [r1, 0x8]\n\
+    strh r4, [r1, 0xA]\n\
+    strh r5, [r1, 0xC]\n\
+    lsls r0, 24\n\
+    asrs r0, 24\n\
+    strh r0, [r1, 0xE]\n\
+    mov r0, r10\n\
+    strh r0, [r1, 0x10]\n\
+    strh r7, [r1, 0x12]\n\
+    mov r3, r9\n\
+    strh r3, [r1, 0x14]\n\
+    strh r2, [r1, 0x1C]\n\
+    strh r4, [r1, 0x1E]\n\
+    strh r3, [r1, 0x20]\n\
+    ldr r2, _0812B104 @ =sub_812B108\n\
+    str r2, [r1]\n\
+    mov r0, r8\n\
+    bl _call_via_r2\n\
+    add sp, 0x4\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .align 2, 0\n\
+_0812B0FC: .4byte gBattleAnimArgs\n\
+_0812B100: .4byte gTasks\n\
+_0812B104: .4byte sub_812B108\n\
+    .syntax divided\n");
+}
+#endif // NONMATCHING