Decompile battle_anim heated_rock

3 files changed, 206 insertions, 293 deletions

diff --git a/asm/heated_rock.s b/asm/heated_rock.s
index eb957a6f1..3adb3a99d 100755
--- a/asm/heated_rock.s
+++ b/asm/heated_rock.s
@@ -6,297 +6,5 @@
 	.text
 
 	@ heated_rock
-
-	thumb_func_start sub_80D58FC
-sub_80D58FC: @ 80D58FC
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_80D59B0
-	adds r0, r4, 0
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	beq _080D5936
-	ldr r3, _080D593C @ =gTasks
-	movs r0, 0x3C
-	ldrsh r1, [r4, r0]
-	lsls r1, 1
-	movs r0, 0x3A
-	ldrsh r2, [r4, r0]
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	adds r1, r0
-	adds r3, 0x8
-	adds r1, r3
-	ldrh r0, [r1]
-	subs r0, 0x1
-	strh r0, [r1]
-	adds r0, r4, 0
-	bl DestroySprite
-_080D5936:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D593C: .4byte gTasks
-	thumb_func_end sub_80D58FC
-
-	thumb_func_start sub_80D5940
-sub_80D5940: @ 80D5940
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _080D5978 @ =gSprites
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	ldrh r2, [r1, 0x26]
-	ldrh r0, [r1, 0x22]
-	adds r2, r0
-	adds r1, 0x29
-	movs r0, 0
-	ldrsb r0, [r1, r0]
-	adds r0, r2
-	lsls r0, 16
-	lsrs r4, r0, 16
-	ldr r0, _080D597C @ =gBattleAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _080D5980
-	lsls r0, r4, 16
-	movs r1, 0x94
-	lsls r1, 15
-	b _080D5986
-	.align 2, 0
-_080D5978: .4byte gSprites
-_080D597C: .4byte gBattleAnimBankAttacker
-_080D5980:
-	lsls r0, r4, 16
-	movs r1, 0xB0
-	lsls r1, 14
-_080D5986:
-	adds r0, r1
-	lsrs r4, r0, 16
-	adds r0, r4, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80D5940
-
-	thumb_func_start sub_80D5994
-sub_80D5994: @ 80D5994
-	movs r3, 0
-	strh r3, [r0, 0x2E]
-	strh r3, [r0, 0x30]
-	ldrh r3, [r0, 0x20]
-	lsls r3, 3
-	strh r3, [r0, 0x32]
-	ldrh r3, [r0, 0x22]
-	lsls r3, 3
-	strh r3, [r0, 0x34]
-	lsls r1, 3
-	strh r1, [r0, 0x36]
-	lsls r2, 3
-	strh r2, [r0, 0x38]
-	bx lr
-	thumb_func_end sub_80D5994
-
-	thumb_func_start sub_80D59B0
-sub_80D59B0: @ 80D59B0
-	push {lr}
-	adds r2, r0, 0
-	ldrh r0, [r2, 0x2E]
-	adds r0, 0x1
-	strh r0, [r2, 0x2E]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x2
-	ble _080D59DA
-	movs r0, 0
-	strh r0, [r2, 0x2E]
-	ldrh r0, [r2, 0x30]
-	adds r0, 0x1
-	strh r0, [r2, 0x30]
-	ldrh r0, [r2, 0x30]
-	adds r1, r0, 0
-	muls r1, r0
-	adds r0, r1, 0
-	ldrh r3, [r2, 0x34]
-	adds r0, r3
-	strh r0, [r2, 0x34]
-_080D59DA:
-	ldrh r0, [r2, 0x36]
-	ldrh r1, [r2, 0x32]
-	adds r0, r1
-	strh r0, [r2, 0x32]
-	lsls r0, 16
-	asrs r0, 19
-	strh r0, [r2, 0x20]
-	ldrh r1, [r2, 0x38]
-	ldrh r3, [r2, 0x34]
-	adds r1, r3
-	strh r1, [r2, 0x34]
-	lsls r1, 16
-	asrs r3, r1, 19
-	strh r3, [r2, 0x22]
-	adds r0, 0x8
-	lsls r0, 16
-	movs r1, 0x80
-	lsls r1, 17
-	cmp r0, r1
-	bhi _080D5A10
-	adds r1, r3, 0
-	movs r0, 0x8
-	negs r0, r0
-	cmp r1, r0
-	blt _080D5A10
-	cmp r1, 0x78
-	ble _080D5A1C
-_080D5A10:
-	adds r0, r2, 0
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r2, 0x4
-	orrs r1, r2
-	strb r1, [r0]
-_080D5A1C:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D59B0
-
-	thumb_func_start sub_80D5A20
-sub_80D5A20: @ 80D5A20
-	push {r4,r5,lr}
-	ldr r3, _080D5A64 @ =gBattleAnimArgs
-	ldrh r1, [r3]
-	movs r2, 0
-	strh r1, [r0, 0x20]
-	ldrh r1, [r3, 0x2]
-	strh r1, [r0, 0x22]
-	strh r2, [r0, 0x2E]
-	strh r2, [r0, 0x30]
-	strh r2, [r0, 0x32]
-	ldrh r1, [r3, 0x4]
-	strh r1, [r0, 0x3A]
-	ldrh r1, [r3, 0x6]
-	strh r1, [r0, 0x3C]
-	ldrh r4, [r0, 0x4]
-	lsls r2, r4, 22
-	lsrs r2, 22
-	movs r5, 0x8
-	ldrsh r1, [r3, r5]
-	lsls r1, 4
-	adds r2, r1
-	ldr r3, _080D5A68 @ =0x000003ff
-	adds r1, r3, 0
-	ands r2, r1
-	ldr r1, _080D5A6C @ =0xfffffc00
-	ands r1, r4
-	orrs r1, r2
-	strh r1, [r0, 0x4]
-	ldr r1, _080D5A70 @ =sub_80D5A74
-	str r1, [r0, 0x1C]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D5A64: .4byte gBattleAnimArgs
-_080D5A68: .4byte 0x000003ff
-_080D5A6C: .4byte 0xfffffc00
-_080D5A70: .4byte sub_80D5A74
-	thumb_func_end sub_80D5A20
-
-	thumb_func_start sub_80D5A74
-sub_80D5A74: @ 80D5A74
-	push {r4,lr}
-	adds r2, r0, 0
-	movs r1, 0x2E
-	ldrsh r0, [r2, r1]
-	cmp r0, 0x1
-	beq _080D5AA6
-	cmp r0, 0x1
-	bgt _080D5A8A
-	cmp r0, 0
-	beq _080D5A90
-	b _080D5B04
-_080D5A8A:
-	cmp r0, 0x2
-	beq _080D5AC4
-	b _080D5B04
-_080D5A90:
-	ldrh r1, [r2, 0x3A]
-	movs r3, 0x3A
-	ldrsh r0, [r2, r3]
-	cmp r0, 0
-	beq _080D5AA0
-	subs r0, r1, 0x1
-	strh r0, [r2, 0x3A]
-	b _080D5B04
-_080D5AA0:
-	ldrh r0, [r2, 0x2E]
-	adds r0, 0x1
-	strh r0, [r2, 0x2E]
-_080D5AA6:
-	ldrh r0, [r2, 0x22]
-	adds r0, 0x8
-	strh r0, [r2, 0x22]
-	lsls r0, 16
-	asrs r0, 16
-	ldrh r3, [r2, 0x3C]
-	movs r4, 0x3C
-	ldrsh r1, [r2, r4]
-	cmp r0, r1
-	blt _080D5B04
-	strh r3, [r2, 0x22]
-	ldrh r0, [r2, 0x2E]
-	adds r0, 0x1
-	strh r0, [r2, 0x2E]
-	b _080D5B04
-_080D5AC4:
-	ldrh r0, [r2, 0x30]
-	adds r0, 0x1
-	strh r0, [r2, 0x30]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x1
-	ble _080D5AF0
-	movs r0, 0
-	strh r0, [r2, 0x30]
-	ldrh r0, [r2, 0x32]
-	adds r0, 0x1
-	strh r0, [r2, 0x32]
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080D5AEC
-	ldr r0, _080D5AE8 @ =0x0000fffd
-	b _080D5AEE
-	.align 2, 0
-_080D5AE8: .4byte 0x0000fffd
-_080D5AEC:
-	movs r0, 0x3
-_080D5AEE:
-	strh r0, [r2, 0x26]
-_080D5AF0:
-	ldrh r0, [r2, 0x34]
-	adds r0, 0x1
-	strh r0, [r2, 0x34]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x10
-	ble _080D5B04
-	adds r0, r2, 0
-	bl move_anim_8072740
-_080D5B04:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D5A74
 	
 	.align 2, 0 @ Don't pad with nop.
diff --git a/ld_script.txt b/ld_script.txt
index 4c71810d9..3b759ebef 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -281,7 +281,7 @@ SECTIONS {
         asm/fire.o(.text);
         src/battle/anim/sunlight.o(.text);
         asm/fire_2.o(.text);
-        asm/heated_rock.o(.text);
+        src/battle/anim/heated_rock.o(.text);
         asm/wisp_orb.o(.text);
         asm/wisp_fire.o(.text);
         asm/thunder.o(.text);
diff --git a/src/battle/anim/heated_rock.c b/src/battle/anim/heated_rock.c
new file mode 100644
index 000000000..1d59669cf
--- /dev/null
+++ b/src/battle/anim/heated_rock.c
@@ -0,0 +1,205 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "rom_8077ABC.h"
+
+extern s16 gBattleAnimArgs[8];
+extern u8 gBattleAnimBankAttacker;
+extern u8 gBattleAnimBankTarget;
+extern u16 gBattleTypeFlags;
+
+void sub_80D59B0(struct Sprite *);
+static void sub_80D5A74(struct Sprite *);
+
+// heated_rock (moves heated rock sprites)
+// Used in Eruption.
+
+void sub_80D58FC(struct Sprite *sprite)
+{
+    sub_80D59B0(sprite);
+
+    if (sprite->invisible)
+    {
+        gTasks[sprite->data[6]].data[sprite->data[7]]--;
+        DestroySprite(sprite);
+    }
+}
+
+u16 sub_80D5940(u8 spriteId)
+{
+    u16 var1 = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y + gSprites[spriteId].centerToCornerVecY;
+
+    if (GetBankSide(gBattleAnimBankAttacker) == 0)
+    {
+        var1 = ((var1 << 16) + 0x4A0000) >> 16;
+    }
+    else
+    {
+        var1 = ((var1 << 16) + 0x2C0000) >> 16;
+    }
+
+    return var1;
+}
+
+void sub_80D5994(struct Sprite *sprite, s16 x, s16 y)
+{
+    sprite->data[0] = 0;
+    sprite->data[1] = 0;
+    sprite->data[2] = (u16)sprite->pos1.x * 8;
+    sprite->data[3] = (u16)sprite->pos1.y * 8;
+    sprite->data[4] = x * 8;
+    sprite->data[5] = y * 8;
+}
+
+#ifdef NONMATCHING
+void sub_80D59B0(struct Sprite *sprite)
+{
+    int var1;
+    int var2;
+
+    if (++sprite->data[0] > 2)
+    {
+        sprite->data[0] = 0;
+        ++sprite->data[1];
+        sprite->data[3] += ((u16)sprite->data[1] * (u16)sprite->data[1]);
+    }
+
+    var1 = (u16)sprite->data[4] + (u16)sprite->data[2];
+    sprite->data[2] = var1;
+    var1 = (s16)var1 >> 3;
+    sprite->pos1.x = var1;
+
+    var2 = (u16)sprite->data[5] + (u16)sprite->data[3];
+    sprite->data[3] = var2;
+    var2 = (s16)var2 >> 3;
+    sprite->pos1.y = var2;
+
+    if ((u32)((var1 + 8) << 16) > 0x1000000 || var2 < -8 || var2 > 120)
+    {
+        sprite->invisible = 1;
+    }
+}
+#else
+__attribute__((naked))
+void sub_80D59B0(struct Sprite *sprite)
+{
+    asm(".syntax unified\n\
+    push {lr}\n\
+    adds r2, r0, 0\n\
+    ldrh r0, [r2, 0x2E]\n\
+    adds r0, 0x1\n\
+    strh r0, [r2, 0x2E]\n\
+    lsls r0, 16\n\
+    asrs r0, 16\n\
+    cmp r0, 0x2\n\
+    ble _080D59DA\n\
+    movs r0, 0\n\
+    strh r0, [r2, 0x2E]\n\
+    ldrh r0, [r2, 0x30]\n\
+    adds r0, 0x1\n\
+    strh r0, [r2, 0x30]\n\
+    ldrh r0, [r2, 0x30]\n\
+    adds r1, r0, 0\n\
+    muls r1, r0\n\
+    adds r0, r1, 0\n\
+    ldrh r3, [r2, 0x34]\n\
+    adds r0, r3\n\
+    strh r0, [r2, 0x34]\n\
+_080D59DA:\n\
+    ldrh r0, [r2, 0x36]\n\
+    ldrh r1, [r2, 0x32]\n\
+    adds r0, r1\n\
+    strh r0, [r2, 0x32]\n\
+    lsls r0, 16\n\
+    asrs r0, 19\n\
+    strh r0, [r2, 0x20]\n\
+    ldrh r1, [r2, 0x38]\n\
+    ldrh r3, [r2, 0x34]\n\
+    adds r1, r3\n\
+    strh r1, [r2, 0x34]\n\
+    lsls r1, 16\n\
+    asrs r3, r1, 19\n\
+    strh r3, [r2, 0x22]\n\
+    adds r0, 0x8\n\
+    lsls r0, 16\n\
+    movs r1, 0x80\n\
+    lsls r1, 17\n\
+    cmp r0, r1\n\
+    bhi _080D5A10\n\
+    adds r1, r3, 0\n\
+    movs r0, 0x8\n\
+    negs r0, r0\n\
+    cmp r1, r0\n\
+    blt _080D5A10\n\
+    cmp r1, 0x78\n\
+    ble _080D5A1C\n\
+_080D5A10:\n\
+    adds r0, r2, 0\n\
+    adds r0, 0x3E\n\
+    ldrb r1, [r0]\n\
+    movs r2, 0x4\n\
+    orrs r1, r2\n\
+    strb r1, [r0]\n\
+_080D5A1C:\n\
+    pop {r0}\n\
+    bx r0\n\
+    .syntax divided\n");
+}
+#endif // NONMATCHING
+
+void sub_80D5A20(struct Sprite *sprite)
+{
+    sprite->pos1.x = gBattleAnimArgs[0];
+    sprite->pos1.y = gBattleAnimArgs[1];
+
+    sprite->data[0] = 0;
+    sprite->data[1] = 0;
+    sprite->data[2] = 0;
+    sprite->data[6] = gBattleAnimArgs[2];
+    sprite->data[7] = gBattleAnimArgs[3];
+
+    sprite->oam.tileNum += gBattleAnimArgs[4] * 16;
+    sprite->callback = sub_80D5A74;
+}
+
+static void sub_80D5A74(struct Sprite *sprite)
+{
+    switch (sprite->data[0])
+    {
+    case 0:
+        if (sprite->data[6] != 0)
+        {
+            sprite->data[6]--;
+            return;
+        }
+
+        sprite->data[0]++;
+        // fall through
+    case 1:
+        sprite->pos1.y += 8;
+        if (sprite->pos1.y >= sprite->data[7])
+        {
+            sprite->pos1.y = sprite->data[7];
+            sprite->data[0]++;
+        }
+        break;
+    case 2:
+        if (++sprite->data[1] > 1)
+        {
+            sprite->data[1] = 0;
+            if ((++sprite->data[2] & 1) != 0)
+            {
+                sprite->pos2.y = -3;
+            }
+            else
+            {
+                sprite->pos2.y = 3;
+            }
+        }
+
+        if (++sprite->data[3] > 16)
+        {
+            move_anim_8072740(sprite);
+        }
+        break;
+    }
+}