Decompile battle_anim wisp_orb

4 files changed, 107 insertions, 231 deletions

diff --git a/asm/wisp_orb.s b/asm/wisp_orb.s
deleted file mode 100755
index cb5920ba4..000000000
--- a/asm/wisp_orb.s
+++ /dev/null
@@ -1,230 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	@ wisp_orb
-
-	thumb_func_start sub_80D5B0C
-sub_80D5B0C: @ 80D5B0C
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	movs r1, 0x2E
-	ldrsh r0, [r5, r1]
-	cmp r0, 0x1
-	beq _080D5B80
-	cmp r0, 0x1
-	bgt _080D5B22
-	cmp r0, 0
-	beq _080D5B28
-	b _080D5C4E
-_080D5B22:
-	cmp r0, 0x2
-	beq _080D5BDE
-	b _080D5C4E
-_080D5B28:
-	adds r0, r5, 0
-	movs r1, 0
-	bl sub_80787B0
-	ldr r4, _080D5B50 @ =gBattleAnimArgs
-	ldrb r1, [r4, 0x4]
-	adds r0, r5, 0
-	bl StartSpriteAnim
-	ldrh r0, [r4, 0x4]
-	strh r0, [r5, 0x3C]
-	ldr r0, _080D5B54 @ =gBattleAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D5B58
-	movs r0, 0x4
-	b _080D5B5A
-	.align 2, 0
-_080D5B50: .4byte gBattleAnimArgs
-_080D5B54: .4byte gBattleAnimBankAttacker
-_080D5B58:
-	ldr r0, _080D5B78 @ =0x0000fffc
-_080D5B5A:
-	strh r0, [r5, 0x36]
-	ldr r0, _080D5B7C @ =gBattleAnimBankTarget
-	ldrb r0, [r0]
-	bl sub_8079ED4
-	movs r1, 0x3
-	ands r1, r0
-	lsls r1, 2
-	ldrb r2, [r5, 0x5]
-	movs r0, 0xD
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r5, 0x5]
-	b _080D5BD6
-	.align 2, 0
-_080D5B78: .4byte 0x0000fffc
-_080D5B7C: .4byte gBattleAnimBankTarget
-_080D5B80:
-	ldrh r0, [r5, 0x30]
-	adds r0, 0xC0
-	strh r0, [r5, 0x30]
-	ldr r0, _080D5BA0 @ =gBattleAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D5BA4
-	ldrh r0, [r5, 0x30]
-	lsls r0, 16
-	asrs r0, 24
-	negs r0, r0
-	b _080D5BAA
-	.align 2, 0
-_080D5BA0: .4byte gBattleAnimBankAttacker
-_080D5BA4:
-	ldrh r0, [r5, 0x30]
-	lsls r0, 16
-	asrs r0, 24
-_080D5BAA:
-	strh r0, [r5, 0x26]
-	movs r2, 0x32
-	ldrsh r0, [r5, r2]
-	movs r2, 0x36
-	ldrsh r1, [r5, r2]
-	bl Sin
-	strh r0, [r5, 0x24]
-	ldrh r0, [r5, 0x32]
-	adds r0, 0x4
-	movs r1, 0xFF
-	ands r0, r1
-	strh r0, [r5, 0x32]
-	ldrh r0, [r5, 0x34]
-	adds r0, 0x1
-	strh r0, [r5, 0x34]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x1
-	bne _080D5C4E
-	movs r0, 0
-	strh r0, [r5, 0x34]
-_080D5BD6:
-	ldrh r0, [r5, 0x2E]
-	adds r0, 0x1
-	strh r0, [r5, 0x2E]
-	b _080D5C4E
-_080D5BDE:
-	movs r1, 0x32
-	ldrsh r0, [r5, r1]
-	movs r2, 0x36
-	ldrsh r1, [r5, r2]
-	bl Sin
-	adds r2, r0, 0
-	movs r3, 0
-	strh r2, [r5, 0x24]
-	ldrh r0, [r5, 0x32]
-	adds r0, 0x4
-	movs r1, 0xFF
-	ands r0, r1
-	strh r0, [r5, 0x32]
-	ldrh r0, [r5, 0x34]
-	adds r0, 0x1
-	strh r0, [r5, 0x34]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x1F
-	bne _080D5C4E
-	ldrh r0, [r5, 0x20]
-	adds r1, r2, r0
-	strh r1, [r5, 0x20]
-	ldrh r0, [r5, 0x26]
-	ldrh r2, [r5, 0x22]
-	adds r0, r2
-	strh r0, [r5, 0x22]
-	strh r3, [r5, 0x26]
-	strh r3, [r5, 0x24]
-	movs r0, 0x80
-	lsls r0, 1
-	strh r0, [r5, 0x2E]
-	strh r1, [r5, 0x30]
-	ldr r4, _080D5C54 @ =gBattleAnimBankTarget
-	ldrb r0, [r4]
-	movs r1, 0x2
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x32]
-	ldrh r0, [r5, 0x22]
-	strh r0, [r5, 0x34]
-	ldrb r0, [r4]
-	movs r1, 0x3
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x36]
-	adds r0, r5, 0
-	bl sub_8078BD4
-	ldr r0, _080D5C58 @ =sub_80D5C5C
-	str r0, [r5, 0x1C]
-_080D5C4E:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D5C54: .4byte gBattleAnimBankTarget
-_080D5C58: .4byte sub_80D5C5C
-	thumb_func_end sub_80D5B0C
-
-	thumb_func_start sub_80D5C5C
-sub_80D5C5C: @ 80D5C5C
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_8078B5C
-	lsls r0, 24
-	cmp r0, 0
-	bne _080D5CB4
-	movs r1, 0x38
-	ldrsh r0, [r4, r1]
-	movs r1, 0x10
-	bl Sin
-	ldrh r1, [r4, 0x24]
-	adds r0, r1
-	strh r0, [r4, 0x24]
-	ldrh r2, [r4, 0x38]
-	adds r0, r2, 0x4
-	movs r1, 0xFF
-	ands r0, r1
-	strh r0, [r4, 0x38]
-	ldrh r0, [r4, 0x38]
-	lsls r2, 16
-	asrs r2, 16
-	cmp r2, 0
-	beq _080D5C92
-	cmp r2, 0xC4
-	ble _080D5CBA
-_080D5C92:
-	lsls r0, 16
-	cmp r0, 0
-	ble _080D5CBA
-	movs r1, 0x3C
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _080D5CBA
-	ldr r0, _080D5CB0 @ =gUnknown_0202F7D2
-	movs r1, 0
-	ldrsb r1, [r0, r1]
-	movs r0, 0x90
-	bl PlaySE12WithPanning
-	b _080D5CBA
-	.align 2, 0
-_080D5CB0: .4byte gUnknown_0202F7D2
-_080D5CB4:
-	adds r0, r4, 0
-	bl move_anim_8072740
-_080D5CBA:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D5C5C
-	
-	.align 2, 0 @ Don't pad with nop.
diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h
index ee32c26d7..70bd6fe5a 100644
--- a/include/rom_8077ABC.h
+++ b/include/rom_8077ABC.h
@@ -106,5 +106,6 @@ 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);
+void sub_8078BD4(struct Sprite *sprite);
 
 #endif // GUARD_ROM_8077ABC_H
diff --git a/ld_script.txt b/ld_script.txt
index 3b759ebef..1b42d7253 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -282,7 +282,7 @@ SECTIONS {
         src/battle/anim/sunlight.o(.text);
         asm/fire_2.o(.text);
         src/battle/anim/heated_rock.o(.text);
-        asm/wisp_orb.o(.text);
+        src/battle/anim/wisp_orb.o(.text);
         asm/wisp_fire.o(.text);
         asm/thunder.o(.text);
         asm/beta_beat_up.o(.text);
diff --git a/src/battle/anim/wisp_orb.c b/src/battle/anim/wisp_orb.c
new file mode 100644
index 000000000..0e13fa119
--- /dev/null
+++ b/src/battle/anim/wisp_orb.c
@@ -0,0 +1,105 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "constants/songs.h"
+#include "rom_8077ABC.h"
+#include "sound.h"
+#include "trig.h"
+
+extern s16 gBattleAnimArgs[8];
+extern u8 gBattleAnimBankAttacker;
+extern u8 gBattleAnimBankTarget;
+extern u16 gBattleTypeFlags;
+extern u8 gUnknown_0202F7D2;
+
+static void sub_80D5C5C(struct Sprite *);
+
+// wisp_orb (animates the wisp orbs)
+// Used in Will-O-Wisp
+
+void sub_80D5B0C(struct Sprite *sprite)
+{
+    switch (sprite->data[0])
+    {
+    case 0:
+        sub_80787B0(sprite, 0);
+        StartSpriteAnim(sprite, gBattleAnimArgs[2]);
+        sprite->data[7] = gBattleAnimArgs[2];
+
+        if (GetBankSide(gBattleAnimBankAttacker) != 0)
+        {
+            sprite->data[4] = 4;
+        }
+        else
+        {
+            sprite->data[4] = -4;
+        }
+
+        sprite->oam.priority = sub_8079ED4(gBattleAnimBankTarget);
+        sprite->data[0]++;
+        break;
+    case 1:
+        sprite->data[1] += 192;
+        if (GetBankSide(gBattleAnimBankAttacker) != 0)
+        {
+            sprite->pos2.y = -(sprite->data[1] >> 8);
+        }
+        else
+        {
+            sprite->pos2.y = sprite->data[1] >> 8;
+        }
+
+        sprite->pos2.x = Sin(sprite->data[2], sprite->data[4]);
+        sprite->data[2] = (sprite->data[2] + 4) & 0xFF;
+
+        if (++sprite->data[3] == 1)
+        {
+            sprite->data[3] = 0;
+            sprite->data[0]++;
+        }
+        break;
+    case 2:
+        sprite->pos2.x = Sin(sprite->data[2], sprite->data[4]);
+        sprite->data[2] = (sprite->data[2] + 4) & 0xFF;
+        
+        if (++sprite->data[3] == 31)
+        {
+            sprite->pos1.x += sprite->pos2.x;
+            sprite->pos1.y += sprite->pos2.y;
+            sprite->pos2.y = 0;
+            sprite->pos2.x = 0;
+
+            sprite->data[0] = 256;
+            sprite->data[1] = sprite->pos1.x;
+            sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2);
+            sprite->data[3] = sprite->pos1.y;
+            sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3);
+
+            sub_8078BD4(sprite);
+            sprite->callback = sub_80D5C5C;
+        }
+        break;
+    }
+}
+
+static void sub_80D5C5C(struct Sprite *sprite)
+{
+    s16 initialData5;
+    s16 newData5;
+
+    if (!sub_8078B5C(sprite))
+    {
+        sprite->pos2.x += Sin(sprite->data[5], 16);
+        initialData5 = sprite->data[5];
+        sprite->data[5] = (sprite->data[5] + 4) & 0xFF;
+        newData5 = sprite->data[5];
+
+        if ((initialData5 == 0 || initialData5 > 196) && newData5 > 0 && sprite->data[7] == 0)
+        {
+            PlaySE12WithPanning(SE_W172, gUnknown_0202F7D2);
+        }
+    }
+    else
+    {
+        move_anim_8072740(sprite);
+    }
+}