decompiled up to sub_80D15A4

2 files changed, 121 insertions, 335 deletions

diff --git a/asm/battle_anim_80CA710.s b/asm/battle_anim_80CA710.s
index 0bcbbbd43..363234319 100644
--- a/asm/battle_anim_80CA710.s
+++ b/asm/battle_anim_80CA710.s
@@ -6,341 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_80D1368
-sub_80D1368: @ 80D1368
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r1, 0
-	bl sub_80787B0
-	ldr r0, _080D139C @ =gBattleAnimPlayerMonIndex
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	movs r1, 0xA0
-	cmp r0, 0
-	beq _080D1384
-	ldr r1, _080D13A0 @ =0x0000ff60
-_080D1384:
-	movs r0, 0xE0
-	lsls r0, 2
-	strh r0, [r4, 0x2E]
-	strh r1, [r4, 0x30]
-	ldr r0, _080D13A4 @ =gBattleAnimArgs
-	ldrh r0, [r0, 0x4]
-	strh r0, [r4, 0x3C]
-	ldr r0, _080D13A8 @ =sub_80D13AC
-	str r0, [r4, 0x1C]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D139C: .4byte gBattleAnimPlayerMonIndex
-_080D13A0: .4byte 0x0000ff60
-_080D13A4: .4byte gBattleAnimArgs
-_080D13A8: .4byte sub_80D13AC
-	thumb_func_end sub_80D1368
-
-	thumb_func_start sub_80D13AC
-sub_80D13AC: @ 80D13AC
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	ldrh r2, [r4, 0x2E]
-	lsls r0, r2, 16
-	asrs r0, 24
-	ldrh r1, [r4, 0x26]
-	subs r1, r0
-	movs r5, 0
-	strh r1, [r4, 0x26]
-	ldrh r0, [r4, 0x30]
-	lsls r0, 16
-	asrs r0, 24
-	strh r0, [r4, 0x24]
-	subs r2, 0x20
-	strh r2, [r4, 0x2E]
-	ldr r0, _080D1418 @ =gBattleAnimPlayerMonIndex
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	movs r1, 0xA0
-	cmp r0, 0
-	beq _080D13DC
-	ldr r1, _080D141C @ =0x0000ff60
-_080D13DC:
-	lsls r0, r1, 16
-	asrs r0, 16
-	ldrh r1, [r4, 0x30]
-	adds r0, r1
-	strh r0, [r4, 0x30]
-	ldrh r1, [r4, 0x26]
-	movs r2, 0x26
-	ldrsh r0, [r4, r2]
-	cmp r0, 0
-	ble _080D1410
-	ldrh r2, [r4, 0x22]
-	adds r0, r1, r2
-	strh r0, [r4, 0x22]
-	ldrh r0, [r4, 0x24]
-	ldrh r1, [r4, 0x20]
-	adds r0, r1
-	strh r0, [r4, 0x20]
-	strh r5, [r4, 0x26]
-	strh r5, [r4, 0x24]
-	strh r5, [r4, 0x2E]
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl StartSpriteAffineAnim
-	ldr r0, _080D1420 @ =sub_80D1424
-	str r0, [r4, 0x1C]
-_080D1410:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D1418: .4byte gBattleAnimPlayerMonIndex
-_080D141C: .4byte 0x0000ff60
-_080D1420: .4byte sub_80D1424
-	thumb_func_end sub_80D13AC
-
-	thumb_func_start sub_80D1424
-sub_80D1424: @ 80D1424
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r0, [r4, 0x2E]
-	adds r1, r0, 0x1
-	strh r1, [r4, 0x2E]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x13
-	ble _080D1442
-	adds r0, r4, 0
-	movs r1, 0x2
-	bl StartSpriteAffineAnim
-	ldr r0, _080D1448 @ =sub_80D144C
-	str r0, [r4, 0x1C]
-_080D1442:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D1448: .4byte sub_80D144C
-	thumb_func_end sub_80D1424
-
-	thumb_func_start sub_80D144C
-sub_80D144C: @ 80D144C
-	push {r4,lr}
-	adds r4, r0, 0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x20
-	ands r0, r1
-	cmp r0, 0
-	beq _080D14B2
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl StartSpriteAffineAnim
-	movs r0, 0
-	strh r0, [r4, 0x2E]
-	movs r1, 0x3C
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _080D1498
-	ldrh r2, [r4, 0x4]
-	lsls r1, r2, 22
-	lsrs r1, 22
-	adds r1, 0x10
-	ldr r3, _080D148C @ =0x000003ff
-	adds r0, r3, 0
-	ands r1, r0
-	ldr r0, _080D1490 @ =0xfffffc00
-	ands r0, r2
-	orrs r0, r1
-	strh r0, [r4, 0x4]
-	ldr r0, _080D1494 @ =sub_80D14C4
-	b _080D14B0
-	.align 2, 0
-_080D148C: .4byte 0x000003ff
-_080D1490: .4byte 0xfffffc00
-_080D1494: .4byte sub_80D14C4
-_080D1498:
-	ldrh r2, [r4, 0x4]
-	lsls r1, r2, 22
-	lsrs r1, 22
-	adds r1, 0x20
-	ldr r3, _080D14B8 @ =0x000003ff
-	adds r0, r3, 0
-	ands r1, r0
-	ldr r0, _080D14BC @ =0xfffffc00
-	ands r0, r2
-	orrs r0, r1
-	strh r0, [r4, 0x4]
-	ldr r0, _080D14C0 @ =sub_80D154C
-_080D14B0:
-	str r0, [r4, 0x1C]
-_080D14B2:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D14B8: .4byte 0x000003ff
-_080D14BC: .4byte 0xfffffc00
-_080D14C0: .4byte sub_80D154C
-	thumb_func_end sub_80D144C
-
-	thumb_func_start sub_80D14C4
-sub_80D14C4: @ 80D14C4
-	push {lr}
-	adds r2, r0, 0
-	ldrh r0, [r2, 0x26]
-	subs r0, 0x2
-	strh r0, [r2, 0x26]
-	ldrh r0, [r2, 0x2E]
-	adds r0, 0x1
-	strh r0, [r2, 0x2E]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x9
-	bne _080D14F8
-	movs r0, 0x10
-	strh r0, [r2, 0x2E]
-	movs r0, 0
-	strh r0, [r2, 0x30]
-	ldr r1, _080D14FC @ =REG_BLDCNT
-	movs r3, 0xFD
-	lsls r3, 6
-	adds r0, r3, 0
-	strh r0, [r1]
-	adds r1, 0x2
-	ldrh r0, [r2, 0x2E]
-	strh r0, [r1]
-	ldr r0, _080D1500 @ =sub_80D1504
-	str r0, [r2, 0x1C]
-_080D14F8:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D14FC: .4byte REG_BLDCNT
-_080D1500: .4byte sub_80D1504
-	thumb_func_end sub_80D14C4
-
-	thumb_func_start sub_80D1504
-sub_80D1504: @ 80D1504
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r0, [r4, 0x30]
-	adds r1, r0, 0x1
-	strh r1, [r4, 0x30]
-	lsls r0, 16
-	asrs r0, 16
-	movs r1, 0x3
-	bl __modsi3
-	lsls r0, 16
-	cmp r0, 0
-	bne _080D153C
-	ldrh r1, [r4, 0x2E]
-	subs r1, 0x1
-	strh r1, [r4, 0x2E]
-	ldr r2, _080D1544 @ =REG_BLDALPHA
-	movs r0, 0x10
-	subs r0, r1
-	lsls r0, 8
-	orrs r1, r0
-	strh r1, [r2]
-	movs r1, 0x2E
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _080D153C
-	ldr r0, _080D1548 @ =sub_80D154C
-	str r0, [r4, 0x1C]
-_080D153C:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D1544: .4byte REG_BLDALPHA
-_080D1548: .4byte sub_80D154C
-	thumb_func_end sub_80D1504
-
-	thumb_func_start sub_80D154C
-sub_80D154C: @ 80D154C
-	push {lr}
-	adds r3, r0, 0
-	ldr r0, _080D1574 @ =gBattleAnimArgs
-	ldrh r1, [r0, 0xE]
-	ldr r0, _080D1578 @ =0x0000ffff
-	cmp r1, r0
-	bne _080D1584
-	adds r2, r3, 0
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r2]
-	movs r1, 0x3C
-	ldrsh r0, [r3, r1]
-	cmp r0, 0
-	bne _080D1580
-	ldr r0, _080D157C @ =sub_80D158C
-	b _080D1582
-	.align 2, 0
-_080D1574: .4byte gBattleAnimArgs
-_080D1578: .4byte 0x0000ffff
-_080D157C: .4byte sub_80D158C
-_080D1580:
-	ldr r0, _080D1588 @ =move_anim_8072740
-_080D1582:
-	str r0, [r3, 0x1C]
-_080D1584:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D1588: .4byte move_anim_8072740
-	thumb_func_end sub_80D154C
-
-	thumb_func_start sub_80D158C
-sub_80D158C: @ 80D158C
-	push {lr}
-	ldr r1, _080D15A0 @ =REG_BLDCNT
-	movs r2, 0
-	strh r2, [r1]
-	adds r1, 0x2
-	strh r2, [r1]
-	bl move_anim_8072740
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D15A0: .4byte REG_BLDCNT
-	thumb_func_end sub_80D158C
-
-	thumb_func_start sub_80D15A4
-sub_80D15A4: @ 80D15A4
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r4, r0, 2
-	adds r4, r0
-	lsls r4, 3
-	ldr r0, _080D15D4 @ =gTasks
-	adds r4, r0
-	movs r0, 0
-	bl obj_id_for_side_relative_to_move
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	strh r1, [r4, 0x8]
-	ldr r2, _080D15D8 @ =gUnknown_083D79BC
-	adds r0, r4, 0
-	bl sub_80798F4
-	ldr r0, _080D15DC @ =sub_80D15E0
-	str r0, [r4]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D15D4: .4byte gTasks
-_080D15D8: .4byte gUnknown_083D79BC
-_080D15DC: .4byte sub_80D15E0
-	thumb_func_end sub_80D15A4
-
 	thumb_func_start sub_80D15E0
 sub_80D15E0: @ 80D15E0
 	push {r4,r5,lr}
diff --git a/src/battle_anim_80CA710.c b/src/battle_anim_80CA710.c
index 80bca9178..c1818fb39 100755
--- a/src/battle_anim_80CA710.c
+++ b/src/battle_anim_80CA710.c
@@ -59,6 +59,7 @@ extern struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FF8;
 extern struct AffineAnimFrameCmd gUnknown_083D76F4;
 extern struct AffineAnimFrameCmd gUnknown_083D7714;
 extern struct AffineAnimFrameCmd gUnknown_083D77B0;
+extern struct AffineAnimFrameCmd gUnknown_083D79BC;
 extern s16 gUnknown_03000728[];
 extern s8 gUnknown_083D680C[11][3];
 extern u16 gUnknown_083D6984[];
@@ -150,6 +151,13 @@ void sub_80D03A8(struct Sprite* sprite);
 void sub_80D0704(struct Sprite* sprite);
 void sub_80D0E8C(struct Sprite* sprite);
 void sub_80D1098(struct Sprite* sprite);
+void sub_80D13AC(struct Sprite* sprite);
+void sub_80D1424(struct Sprite* sprite);
+void sub_80D144C(struct Sprite* sprite);
+void sub_80D14C4(struct Sprite* sprite);
+void sub_80D1504(struct Sprite* sprite);
+void sub_80D154C(struct Sprite* sprite);
+void sub_80D158C(struct Sprite* sprite);
 
 s16 sub_80CC338(struct Sprite* sprite);
 
@@ -213,6 +221,8 @@ void sub_80D0904(u8 taskId);
 void sub_80D0A8C(u8 taskId);
 void sub_80D0B3C(u8 taskId);
 void sub_80D0D68(u8 taskId);
+void sub_80D15E0(u8 taskId);
+
 
 void sub_80CC358(struct Task* task, u8 taskId);
 void sub_80D0614(struct Task* task, u8 taskId);
@@ -5540,4 +5550,115 @@ void sub_80D1318(struct Sprite* sprite)
     StartSpriteAffineAnim(sprite, 1);
     sprite->callback = sub_80793C4;
     sub_80793C4(sprite);
+}
+
+void sub_80D1368(struct Sprite* sprite)
+{
+    s16 r1;
+    sub_80787B0(sprite, 0);
+    r1 = (GetBankSide(gBattleAnimPlayerMonIndex)) ? -0xA0 : 0xA0;
+    sprite->data0 = 0x380;
+    sprite->data1 = r1;
+    sprite->data7 = gBattleAnimArgs[2];
+    sprite->callback = sub_80D13AC;
+}
+
+void sub_80D13AC(struct Sprite* sprite)
+{
+    s16 add;
+    sprite->pos2.y -= (sprite->data0 >> 8);
+    sprite->pos2.x = sprite->data1 >> 8;
+    sprite->data0 -= 32;
+    add = (GetBankSide(gBattleAnimPlayerMonIndex)) ? -0xA0 : 0xA0;
+    sprite->data1 += add;
+    if (sprite->pos2.y > 0)
+    {
+        sprite->pos1.y += sprite->pos2.y;
+        sprite->pos1.x += sprite->pos2.x;
+        sprite->pos2.y = 0;
+        sprite->pos2.x = 0;
+        sprite->data0 = 0;
+        StartSpriteAffineAnim(sprite, 1);
+        sprite->callback = sub_80D1424;
+    }
+}
+
+void sub_80D1424(struct Sprite* sprite)
+{
+    if (sprite->data0++ > 19)
+    {
+        StartSpriteAffineAnim(sprite, 2);
+        sprite->callback = sub_80D144C;
+    }
+}
+
+void sub_80D144C(struct Sprite* sprite)
+{
+    if (sprite->affineAnimEnded)
+    {
+        StartSpriteAffineAnim(sprite, 1);
+        sprite->data0 = 0;
+        if (sprite->data7 == 0)
+        {
+            sprite->oam.tileNum += 16;
+            sprite->callback = sub_80D14C4;
+        }
+        else
+        {
+            sprite->oam.tileNum += 32;
+            sprite->callback = sub_80D154C;
+        }
+    }
+}
+
+void sub_80D14C4(struct Sprite* sprite)
+{
+    sprite->pos2.y -= 2;
+    if (++sprite->data0 == 9)
+    {
+        sprite->data0 = 16;
+        sprite->data1 = 0;
+        REG_BLDCNT = 0x3F40;
+        REG_BLDALPHA = sprite->data0;
+        sprite->callback = sub_80D1504;
+    }
+}
+
+void sub_80D1504(struct Sprite* sprite)
+{
+    if (sprite->data1++ % 3 == 0)
+    {
+        sprite->data0--;
+        REG_BLDALPHA = sprite->data0 | ((16 - sprite->data0) << 8);
+        if (sprite->data0 == 0)
+            sprite->callback = sub_80D154C;
+    }
+}
+
+void sub_80D154C(struct Sprite* sprite)
+{
+    if ((u16)gBattleAnimArgs[7] == 0xFFFF)
+    {
+        sprite->invisible = 1;
+        if (sprite->data7 == 0)
+            sprite->callback = sub_80D158C;
+        else
+            sprite->callback = move_anim_8072740;
+    }
+}
+
+void sub_80D158C(struct Sprite* sprite)
+{
+    REG_BLDCNT = 0;
+    REG_BLDALPHA = 0;
+    move_anim_8072740(sprite);
+}
+
+void sub_80D15A4(u8 taskId)
+{
+    struct Task* task = &gTasks[taskId];
+    u8 spriteId = obj_id_for_side_relative_to_move(0);
+    task->data[0] = spriteId;
+    sub_80798F4(task, spriteId, &gUnknown_083D79BC);
+    task->func = sub_80D15E0;
 }
\ No newline at end of file