Decompile battle_anim note_spin

4 files changed, 112 insertions, 235 deletions

diff --git a/asm/note_spin.s b/asm/note_spin.s
deleted file mode 100755
index d0df90fd1..000000000
--- a/asm/note_spin.s
+++ /dev/null
@@ -1,234 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_80D2E68
-sub_80D2E68: @ 80D2E68
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r1, 0x2E
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _080D2E8A
-	ldr r0, _080D2EC4 @ =gBattleAnimArgs
-	ldrh r1, [r0]
-	movs r0, 0x78
-	subs r0, r1
-	strh r0, [r4, 0x30]
-	adds r2, r4, 0
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r2]
-_080D2E8A:
-	ldrh r0, [r4, 0x2E]
-	adds r0, 0x1
-	strh r0, [r4, 0x2E]
-	lsls r0, 16
-	asrs r0, 16
-	movs r2, 0x30
-	ldrsh r1, [r4, r2]
-	cmp r0, r1
-	bne _080D2EA8
-	ldrb r0, [r4, 0x5]
-	lsrs r0, 4
-	adds r0, 0x10
-	movs r1, 0
-	bl sub_8079108
-_080D2EA8:
-	movs r0, 0x2E
-	ldrsh r1, [r4, r0]
-	movs r2, 0x30
-	ldrsh r0, [r4, r2]
-	adds r0, 0x50
-	cmp r1, r0
-	bne _080D2EBC
-	adds r0, r4, 0
-	bl move_anim_8072740
-_080D2EBC:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D2EC4: .4byte gBattleAnimArgs
-	thumb_func_end sub_80D2E68
-
-	thumb_func_start sub_80D2EC8
-sub_80D2EC8: @ 80D2EC8
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	movs r1, 0x2E
-	ldrsh r0, [r6, r1]
-	cmp r0, 0
-	bne _080D2EF6
-	movs r5, 0x78
-	strh r5, [r6, 0x20]
-	ldr r4, _080D2F78 @ =gBattleAnimArgs
-	movs r2, 0
-	ldrsh r0, [r4, r2]
-	lsrs r1, r0, 31
-	adds r0, r1
-	asrs r0, 1
-	subs r0, 0xF
-	strh r0, [r6, 0x22]
-	ldrb r1, [r4, 0x2]
-	adds r0, r6, 0
-	bl StartSpriteAnim
-	strh r5, [r6, 0x38]
-	ldrh r0, [r4, 0x4]
-	strh r0, [r6, 0x34]
-_080D2EF6:
-	ldrh r0, [r6, 0x2E]
-	adds r0, 0x1
-	movs r5, 0
-	strh r0, [r6, 0x2E]
-	movs r1, 0x2E
-	ldrsh r0, [r6, r1]
-	lsrs r1, r0, 31
-	adds r0, r1
-	asrs r0, 1
-	strh r0, [r6, 0x30]
-	movs r2, 0x2E
-	ldrsh r0, [r6, r2]
-	lsls r4, r0, 1
-	adds r4, r0
-	ldrh r0, [r6, 0x34]
-	adds r4, r0
-	movs r2, 0xFF
-	ldrh r0, [r6, 0x3A]
-	adds r0, 0xA
-	movs r1, 0xFF
-	ands r0, r1
-	strh r0, [r6, 0x3A]
-	ands r4, r2
-	adds r0, r4, 0
-	movs r1, 0x64
-	bl Cos
-	strh r0, [r6, 0x24]
-	adds r0, r4, 0
-	movs r1, 0xA
-	bl Sin
-	adds r4, r0, 0
-	movs r1, 0x3A
-	ldrsh r0, [r6, r1]
-	movs r1, 0x4
-	bl Cos
-	ldrh r2, [r6, 0x30]
-	adds r4, r2
-	adds r0, r4
-	strh r0, [r6, 0x26]
-	movs r0, 0x2E
-	ldrsh r1, [r6, r0]
-	movs r2, 0x38
-	ldrsh r0, [r6, r2]
-	cmp r1, r0
-	ble _080D2F72
-	ldr r0, _080D2F7C @ =sub_80D2F80
-	str r0, [r6, 0x1C]
-	strh r5, [r6, 0x2E]
-	adds r0, r6, 0
-	bl oamt_add_pos2_onto_pos1
-	movs r0, 0x5
-	strh r0, [r6, 0x32]
-	strh r5, [r6, 0x36]
-	strh r5, [r6, 0x34]
-	adds r0, r6, 0
-	movs r1, 0x1
-	bl StartSpriteAffineAnim
-_080D2F72:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D2F78: .4byte gBattleAnimArgs
-_080D2F7C: .4byte sub_80D2F80
-	thumb_func_end sub_80D2EC8
-
-	thumb_func_start sub_80D2F80
-sub_80D2F80: @ 80D2F80
-	push {lr}
-	adds r1, r0, 0
-	ldrh r0, [r1, 0x2E]
-	adds r0, 0x1
-	strh r0, [r1, 0x2E]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0xA
-	ble _080D2F9A
-	movs r0, 0
-	strh r0, [r1, 0x2E]
-	ldr r0, _080D2FA0 @ =sub_80D2FA4
-	str r0, [r1, 0x1C]
-_080D2F9A:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D2FA0: .4byte sub_80D2FA4
-	thumb_func_end sub_80D2F80
-
-	thumb_func_start sub_80D2FA4
-sub_80D2FA4: @ 80D2FA4
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r1, [r4, 0x32]
-	ldrh r2, [r4, 0x34]
-	adds r0, r1, r2
-	strh r0, [r4, 0x34]
-	strh r0, [r4, 0x26]
-	adds r1, 0x1
-	strh r1, [r4, 0x32]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x30
-	ble _080D2FCE
-	lsls r0, r1, 16
-	cmp r0, 0
-	ble _080D2FCE
-	ldrh r0, [r4, 0x36]
-	subs r1, r0, 0x5
-	strh r1, [r4, 0x32]
-	adds r0, 0x1
-	strh r0, [r4, 0x36]
-_080D2FCE:
-	movs r1, 0x36
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x3
-	ble _080D3000
-	movs r2, 0x32
-	ldrsh r1, [r4, r2]
-	lsrs r0, r1, 31
-	adds r0, r1, r0
-	asrs r0, 1
-	lsls r0, 1
-	subs r1, r0
-	adds r3, r4, 0
-	adds r3, 0x3E
-	movs r0, 0x1
-	ands r1, r0
-	lsls r1, 2
-	ldrb r2, [r3]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3]
-	adds r0, r4, 0
-	bl move_anim_8072740
-_080D3000:
-	movs r1, 0x36
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x4
-	bne _080D300E
-	adds r0, r4, 0
-	bl move_anim_8072740
-_080D300E:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D2FA4
-	
-	.align 2, 0 @ Don't pad with nop.
diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h
index 703ae18a2..ee32c26d7 100644
--- a/include/rom_8077ABC.h
+++ b/include/rom_8077ABC.h
@@ -105,5 +105,6 @@ u8 sub_8077FC0(u8 slot);
 void move_anim_8074EE0(struct Sprite *sprite);
 bool8 sub_8078718(struct Sprite *sprite);
 bool8 sub_8078CE8(struct Sprite *sprite);
+void oamt_add_pos2_onto_pos1(struct Sprite *sprite);
 
 #endif // GUARD_ROM_8077ABC_H
diff --git a/ld_script.txt b/ld_script.txt
index 12a7a4c9d..0de169fdf 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -269,7 +269,7 @@ SECTIONS {
         src/battle/anim/struggle.o(.text);
         src/battle/anim/uproar.o(.text);
         src/battle/anim/noise.o(.text);
-        asm/note_spin.o(.text);
+        src/battle/anim/note_spin.o(.text);
         asm/guard.o(.text);
         asm/fury_cutter_count.o(.text);
         asm/rain.o(.text);
diff --git a/src/battle/anim/note_spin.c b/src/battle/anim/note_spin.c
new file mode 100644
index 000000000..bdc0f4615
--- /dev/null
+++ b/src/battle/anim/note_spin.c
@@ -0,0 +1,110 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "rom_8077ABC.h"
+#include "trig.h"
+
+extern s16 gBattleAnimArgs[8];
+extern u8 gBattleAnimBankAttacker;
+extern u8 gBattleAnimBankTarget;
+
+static void sub_80D2F80(struct Sprite *);
+static void sub_80D2FA4(struct Sprite *);
+
+// note_spin (spins music notes around, and rotates them)
+// Used in Perish Song.
+
+void sub_80D2E68(struct Sprite *sprite)
+{
+    if (sprite->data[0] == 0)
+    {
+        sprite->data[1] = 120 - gBattleAnimArgs[0];
+        sprite->invisible = 1;
+    }
+
+    if (++sprite->data[0] == sprite->data[1])
+    {
+        sub_8079108(sprite->oam.paletteNum + 16, 0);
+    }
+
+    if (sprite->data[0] == sprite->data[1] + 80)
+    {
+        move_anim_8072740(sprite);
+    }
+}
+
+void sub_80D2EC8(struct Sprite *sprite)
+{
+    int index;
+    int var2;
+
+    if (sprite->data[0] == 0)
+    {
+        sprite->pos1.x = 120;
+        sprite->pos1.y = (gBattleAnimArgs[0] + (((u16)gBattleAnimArgs[0]) >> 31)) / 2 - 15;
+
+        StartSpriteAnim(sprite, gBattleAnimArgs[1]);
+
+        sprite->data[5] = 120;
+        sprite->data[3] = gBattleAnimArgs[2];
+    }
+
+    sprite->data[0]++;
+
+    sprite->data[1] = (sprite->data[0] + ((u16)sprite->data[0] >> 31)) / 2;
+    index = ((sprite->data[0] * 3) + (u16)sprite->data[3]);
+    var2 = 0xFF;
+    sprite->data[6] = (sprite->data[6] + 10) & 0xFF;
+
+    index &= var2;
+    sprite->pos2.x = Cos(index, 100);
+
+    sprite->pos2.y = sprite->data[1] + Sin(index, 10) + Cos(sprite->data[6], 4);
+
+    if (sprite->data[0] > sprite->data[5])
+    {
+        sprite->callback = sub_80D2F80;
+
+        sprite->data[0] = 0;
+        oamt_add_pos2_onto_pos1(sprite);
+        sprite->data[2] = 5;
+        sprite->data[4] = 0;
+        sprite->data[3] = 0;
+
+        StartSpriteAffineAnim(sprite, 1);
+    }
+}
+
+static void sub_80D2F80(struct Sprite *sprite)
+{
+    if (++sprite->data[0] > 10)
+    {
+        sprite->data[0] = 0;
+        sprite->callback = sub_80D2FA4;
+    }
+}
+
+static void sub_80D2FA4(struct Sprite *sprite)
+{
+    sprite->data[3] += sprite->data[2];
+    sprite->pos2.y = sprite->data[3];
+
+    sprite->data[2]++;
+
+    if (sprite->data[3] > 48 && sprite->data[2] > 0)
+    {
+        sprite->data[2] = sprite->data[4] - 5;
+        sprite->data[4]++;
+    }
+
+    if (sprite->data[4] > 3)
+    {
+        int var1 = sprite->data[2];
+        sprite->invisible = var1 - (((s32)(var1 + ((u32)var1 >> 31)) >> 1) << 1);
+        move_anim_8072740(sprite);
+    }
+
+    if (sprite->data[4] == 4)
+    {
+        move_anim_8072740(sprite);
+    }
+}