More rock.s decompilation

2 files changed, 126 insertions, 415 deletions

diff --git a/asm/rock.s b/asm/rock.s
index 853338ce0..41a04a3f6 100644
--- a/asm/rock.s
+++ b/asm/rock.s
@@ -7,421 +7,6 @@
 
 	@ rock
 
-	thumb_func_start sub_80DD190
-sub_80DD190: @ 80DD190
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x10
-	lsls r0, 24
-	lsrs r7, r0, 24
-	ldr r1, _080DD1C0 @ =gTasks
-	lsls r0, r7, 2
-	adds r0, r7
-	lsls r0, 3
-	adds r0, r1
-	movs r2, 0x8
-	ldrsh r0, [r0, r2]
-	adds r3, r1, 0
-	cmp r0, 0
-	bne _080DD1CC
-	ldr r1, _080DD1C4 @ =gBattle_BG1_X
-	ldr r5, _080DD1C8 @ =0x0000fffa
-	adds r0, r5, 0
-	ldrh r2, [r1]
-	adds r0, r2
-	b _080DD1D2
-	.align 2, 0
-_080DD1C0: .4byte gTasks
-_080DD1C4: .4byte gBattle_BG1_X
-_080DD1C8: .4byte 0x0000fffa
-_080DD1CC:
-	ldr r1, _080DD204 @ =gBattle_BG1_X
-	ldrh r0, [r1]
-	adds r0, 0x6
-_080DD1D2:
-	strh r0, [r1]
-	adds r4, r1, 0
-	ldr r1, _080DD208 @ =gBattle_BG1_Y
-	ldr r5, _080DD20C @ =0x0000ffff
-	adds r0, r5, 0
-	ldrh r2, [r1]
-	adds r0, r2
-	strh r0, [r1]
-	lsls r2, r7, 2
-	adds r0, r2, r7
-	lsls r0, 3
-	adds r0, r3
-	movs r5, 0x20
-	ldrsh r0, [r0, r5]
-	mov r8, r2
-	adds r2, r1, 0
-	cmp r0, 0x4
-	bls _080DD1F8
-	b _080DD37C
-_080DD1F8:
-	lsls r0, 2
-	ldr r1, _080DD210 @ =_080DD214
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_080DD204: .4byte gBattle_BG1_X
-_080DD208: .4byte gBattle_BG1_Y
-_080DD20C: .4byte 0x0000ffff
-_080DD210: .4byte _080DD214
-	.align 2, 0
-_080DD214:
-	.4byte _080DD228
-	.4byte _080DD270
-	.4byte _080DD292
-	.4byte _080DD2D4
-	.4byte _080DD358
-_080DD228:
-	mov r1, r8
-	adds r0, r1, r7
-	lsls r0, 3
-	adds r3, r0, r3
-	ldrh r0, [r3, 0x1C]
-	adds r0, 0x1
-	movs r4, 0
-	strh r0, [r3, 0x1C]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x4
-	beq _080DD242
-	b _080DD37C
-_080DD242:
-	strh r4, [r3, 0x1C]
-	ldrh r1, [r3, 0x1E]
-	adds r1, 0x1
-	strh r1, [r3, 0x1E]
-	ldr r2, _080DD26C @ =REG_BLDALPHA
-	movs r0, 0x10
-	subs r0, r1
-	lsls r0, 8
-	orrs r1, r0
-	strh r1, [r2]
-	movs r2, 0x1E
-	ldrsh r0, [r3, r2]
-	cmp r0, 0x7
-	beq _080DD260
-	b _080DD37C
-_080DD260:
-	ldrh r0, [r3, 0x20]
-	adds r0, 0x1
-	strh r0, [r3, 0x20]
-	strh r4, [r3, 0x1E]
-	b _080DD37C
-	.align 2, 0
-_080DD26C: .4byte REG_BLDALPHA
-_080DD270:
-	mov r5, r8
-	adds r0, r5, r7
-	lsls r0, 3
-	adds r1, r0, r3
-	ldrh r0, [r1, 0x1E]
-	adds r0, 0x1
-	strh r0, [r1, 0x1E]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x65
-	bne _080DD37C
-	movs r0, 0x7
-	strh r0, [r1, 0x1E]
-	ldrh r0, [r1, 0x20]
-	adds r0, 0x1
-	strh r0, [r1, 0x20]
-	b _080DD37C
-_080DD292:
-	mov r1, r8
-	adds r0, r1, r7
-	lsls r0, 3
-	adds r3, r0, r3
-	ldrh r0, [r3, 0x1C]
-	adds r0, 0x1
-	strh r0, [r3, 0x1C]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x4
-	bne _080DD37C
-	movs r0, 0
-	strh r0, [r3, 0x1C]
-	ldrh r1, [r3, 0x1E]
-	subs r1, 0x1
-	strh r1, [r3, 0x1E]
-	ldr r2, _080DD2D0 @ =REG_BLDALPHA
-	movs r0, 0x10
-	subs r0, r1
-	lsls r0, 8
-	orrs r1, r0
-	strh r1, [r2]
-	movs r2, 0x1E
-	ldrsh r1, [r3, r2]
-	cmp r1, 0
-	bne _080DD37C
-	ldrh r0, [r3, 0x20]
-	adds r0, 0x1
-	strh r0, [r3, 0x20]
-	strh r1, [r3, 0x1E]
-	b _080DD37C
-	.align 2, 0
-_080DD2D0: .4byte REG_BLDALPHA
-_080DD2D4:
-	mov r0, sp
-	bl sub_8078914
-	ldr r2, [sp]
-	movs r3, 0x80
-	lsls r3, 6
-	add r5, sp, 0xC
-	movs r6, 0
-	ldr r1, _080DD38C @ =0x040000d4
-	movs r4, 0x80
-	lsls r4, 5
-	mov r9, r5
-	ldr r0, _080DD390 @ =0x85000400
-	mov r12, r0
-	movs r0, 0x85
-	lsls r0, 24
-	mov r10, r0
-_080DD2F6:
-	str r6, [sp, 0xC]
-	mov r0, r9
-	str r0, [r1]
-	str r2, [r1, 0x4]
-	mov r0, r12
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	adds r2, r4
-	subs r3, r4
-	cmp r3, r4
-	bhi _080DD2F6
-	str r6, [sp, 0xC]
-	str r5, [r1]
-	str r2, [r1, 0x4]
-	lsrs r0, r3, 2
-	mov r2, r10
-	orrs r0, r2
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	ldr r1, [sp, 0x4]
-	movs r0, 0
-	str r0, [sp, 0xC]
-	ldr r0, _080DD38C @ =0x040000d4
-	str r5, [r0]
-	str r1, [r0, 0x4]
-	ldr r1, _080DD394 @ =0x85000200
-	str r1, [r0, 0x8]
-	ldr r0, [r0, 0x8]
-	bl IsContest
-	lsls r0, 24
-	cmp r0, 0
-	bne _080DD344
-	ldr r2, _080DD398 @ =REG_BG1CNT
-	ldrb r1, [r2]
-	movs r0, 0xD
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2]
-_080DD344:
-	ldr r0, _080DD39C @ =gTasks
-	mov r5, r8
-	adds r1, r5, r7
-	lsls r1, 3
-	adds r1, r0
-	ldrh r0, [r1, 0x20]
-	adds r0, 0x1
-	strh r0, [r1, 0x20]
-	ldr r4, _080DD3A0 @ =gBattle_BG1_X
-	ldr r2, _080DD3A4 @ =gBattle_BG1_Y
-_080DD358:
-	movs r1, 0
-	strh r1, [r4]
-	strh r1, [r2]
-	ldr r0, _080DD3A8 @ =REG_BLDCNT
-	strh r1, [r0]
-	adds r0, 0x2
-	strh r1, [r0]
-	ldr r2, _080DD398 @ =REG_BG1CNT
-	ldrb r1, [r2]
-	movs r0, 0x4
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x1
-	orrs r0, r1
-	strb r0, [r2]
-	adds r0, r7, 0
-	bl DestroyAnimVisualTask
-_080DD37C:
-	add sp, 0x10
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DD38C: .4byte 0x040000d4
-_080DD390: .4byte 0x85000400
-_080DD394: .4byte 0x85000200
-_080DD398: .4byte REG_BG1CNT
-_080DD39C: .4byte gTasks
-_080DD3A0: .4byte gBattle_BG1_X
-_080DD3A4: .4byte gBattle_BG1_Y
-_080DD3A8: .4byte REG_BLDCNT
-	thumb_func_end sub_80DD190
-
-	thumb_func_start sub_80DD3AC
-sub_80DD3AC: @ 80DD3AC
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	movs r1, 0x2E
-	ldrsh r0, [r5, r1]
-	cmp r0, 0
-	bne _080DD428
-	ldr r4, _080DD3F0 @ =gBattleAnimArgs
-	movs r2, 0x6
-	ldrsh r0, [r4, r2]
-	cmp r0, 0
-	beq _080DD3F8
-	ldr r0, _080DD3F4 @ =gAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080DD3F8
-	movs r0, 0x98
-	lsls r0, 1
-	strh r0, [r5, 0x20]
-	ldrh r0, [r4, 0x2]
-	negs r0, r0
-	strh r0, [r4, 0x2]
-	movs r0, 0x1
-	strh r0, [r5, 0x38]
-	ldrb r1, [r5, 0x3]
-	subs r0, 0x40
-	ands r0, r1
-	movs r1, 0x10
-	orrs r0, r1
-	strb r0, [r5, 0x3]
-	b _080DD3FC
-	.align 2, 0
-_080DD3F0: .4byte gBattleAnimArgs
-_080DD3F4: .4byte gAnimBankAttacker
-_080DD3F8:
-	ldr r0, _080DD41C @ =0x0000ffc0
-	strh r0, [r5, 0x20]
-_080DD3FC:
-	ldr r4, _080DD420 @ =gBattleAnimArgs
-	ldrh r0, [r4]
-	strh r0, [r5, 0x22]
-	ldr r1, _080DD424 @ =gUnknown_083DAD10
-	adds r0, r5, 0
-	bl SetSubspriteTables
-	ldrh r0, [r4, 0x2]
-	strh r0, [r5, 0x30]
-	ldrh r0, [r4, 0x4]
-	strh r0, [r5, 0x32]
-	ldrh r0, [r5, 0x2E]
-	adds r0, 0x1
-	strh r0, [r5, 0x2E]
-	b _080DD484
-	.align 2, 0
-_080DD41C: .4byte 0x0000ffc0
-_080DD420: .4byte gBattleAnimArgs
-_080DD424: .4byte gUnknown_083DAD10
-_080DD428:
-	ldrh r1, [r5, 0x30]
-	ldrh r3, [r5, 0x34]
-	adds r1, r3
-	ldrh r2, [r5, 0x32]
-	ldrh r0, [r5, 0x36]
-	adds r2, r0
-	lsls r0, r1, 16
-	asrs r0, 24
-	ldrh r3, [r5, 0x24]
-	adds r0, r3
-	strh r0, [r5, 0x24]
-	lsls r0, r2, 16
-	asrs r0, 24
-	ldrh r3, [r5, 0x26]
-	adds r0, r3
-	strh r0, [r5, 0x26]
-	movs r0, 0xFF
-	ands r1, r0
-	strh r1, [r5, 0x34]
-	ands r2, r0
-	strh r2, [r5, 0x36]
-	movs r1, 0x38
-	ldrsh r0, [r5, r1]
-	cmp r0, 0
-	bne _080DD46E
-	movs r2, 0x20
-	ldrsh r0, [r5, r2]
-	movs r3, 0x24
-	ldrsh r1, [r5, r3]
-	adds r0, r1
-	movs r1, 0x88
-	lsls r1, 1
-	cmp r0, r1
-	ble _080DD484
-	b _080DD480
-_080DD46E:
-	movs r1, 0x20
-	ldrsh r0, [r5, r1]
-	movs r2, 0x24
-	ldrsh r1, [r5, r2]
-	adds r0, r1
-	movs r1, 0x20
-	negs r1, r1
-	cmp r0, r1
-	bge _080DD484
-_080DD480:
-	ldr r0, _080DD48C @ =DestroyAnimSprite
-	str r0, [r5, 0x1C]
-_080DD484:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DD48C: .4byte DestroyAnimSprite
-	thumb_func_end sub_80DD3AC
-
-	thumb_func_start sub_80DD490
-sub_80DD490: @ 80DD490
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	ldr r5, _080DD4C8 @ =gBattleAnimArgs
-	ldrb r1, [r5, 0x8]
-	bl StartSpriteAnim
-	adds r0, r4, 0
-	movs r1, 0
-	bl sub_80787B0
-	ldrh r0, [r5, 0x6]
-	strh r0, [r4, 0x2E]
-	ldrh r0, [r4, 0x20]
-	strh r0, [r4, 0x32]
-	ldrh r0, [r5, 0x4]
-	ldrh r1, [r4, 0x22]
-	adds r0, r1
-	strh r0, [r4, 0x36]
-	ldr r0, _080DD4CC @ =sub_8078B34
-	str r0, [r4, 0x1C]
-	ldr r1, _080DD4D0 @ =DestroyAnimSprite
-	adds r0, r4, 0
-	bl StoreSpriteCallbackInData
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DD4C8: .4byte gBattleAnimArgs
-_080DD4CC: .4byte sub_8078B34
-_080DD4D0: .4byte DestroyAnimSprite
-	thumb_func_end sub_80DD490
-
 	thumb_func_start sub_80DD4D4
 sub_80DD4D4: @ 80DD4D4
 	push {r4-r7,lr}
diff --git a/src/battle/anim/rock.c b/src/battle/anim/rock.c
index d4307e7c1..26ac78053 100644
--- a/src/battle/anim/rock.c
+++ b/src/battle/anim/rock.c
@@ -17,6 +17,8 @@ extern const u8 gBattleAnimBackgroundTilemap_SandstormBrew[];
 extern const u8 gBattleAnimBackgroundImage_SandstormBrew[];
 extern const u16 gBattleAnimSpritePalette_261[];
 
+extern const struct SubspriteTable gUnknown_083DAD10;
+
 static void sub_80DCF1C(struct Sprite *sprite);
 static void sub_80DD02C(struct Sprite *sprite);
 void sub_80DD190(u8 taskId);
@@ -147,3 +149,127 @@ void do_boulder_dust(u8 taskId)
     gTasks[taskId].data[0] = var0;
     gTasks[taskId].func = sub_80DD190;
 }
+
+void sub_80DD190(u8 taskId)
+{    
+    struct Struct_sub_8078914 subStruct;
+
+    if (gTasks[taskId].data[0] == 0)
+        gBattle_BG1_X += 0xFFFA;
+    else
+        gBattle_BG1_X += 6;
+
+    gBattle_BG1_Y += -1;
+
+    switch (gTasks[taskId].data[12])
+    {
+    case 0:
+        if (++gTasks[taskId].data[10] == 4)
+        {
+            gTasks[taskId].data[10] = 0;
+            gTasks[taskId].data[11]++;
+            REG_BLDALPHA = gTasks[taskId].data[11] | ((16 - gTasks[taskId].data[11]) << 8);
+            if (gTasks[taskId].data[11] == 7)
+            {
+                gTasks[taskId].data[12]++;
+                gTasks[taskId].data[11] = 0;
+            }
+        }
+        break;
+    case 1:
+        if (++gTasks[taskId].data[11] == 101)
+        {
+            gTasks[taskId].data[11] = 7;
+            gTasks[taskId].data[12]++;
+        }
+        break;
+    case 2:
+        if (++gTasks[taskId].data[10] == 4)
+        {
+            gTasks[taskId].data[10] = 0;
+            gTasks[taskId].data[11]--;
+            REG_BLDALPHA = gTasks[taskId].data[11] | ((16 - gTasks[taskId].data[11]) << 8);
+            if (gTasks[taskId].data[11] == 0)
+            {
+                gTasks[taskId].data[12]++;
+                gTasks[taskId].data[11] = 0;
+            }
+        }
+        break;
+    case 3:
+        sub_8078914(&subStruct);
+        DmaFill32Large(3, 0, subStruct.field_0, 0x2000, 0x1000);
+        DmaClear32(3, subStruct.field_4, 0x800);
+        if (!IsContest())
+            REG_BG1CNT_BITFIELD.charBaseBlock = 0;
+
+        gTasks[taskId].data[12]++;
+        // fall through
+    case 4:
+        gBattle_BG1_X = 0;
+        gBattle_BG1_Y = 0;
+        REG_BLDCNT = 0;
+        REG_BLDALPHA = 0;
+        REG_BG1CNT_BITFIELD.priority = 1;
+        DestroyAnimVisualTask(taskId);
+        break;
+    }
+}
+
+void sub_80DD3AC(struct Sprite *sprite)
+{
+    if (sprite->data[0] == 0)
+    {
+        if (gBattleAnimArgs[3] != 0 && GetBankSide(gAnimBankAttacker) != SIDE_PLAYER)
+        {
+            sprite->pos1.x = 304;
+            gBattleAnimArgs[1] = -gBattleAnimArgs[1];
+            sprite->data[5] = 1;
+            sprite->oam.matrixNum = 8;
+        }
+        else
+        {
+            sprite->pos1.x = -64;
+        }
+
+        sprite->pos1.y = gBattleAnimArgs[0];
+        SetSubspriteTables(sprite, &gUnknown_083DAD10);
+        sprite->data[1] = gBattleAnimArgs[1];
+        sprite->data[2] = gBattleAnimArgs[2];
+        sprite->data[0]++;
+    }
+    else
+    {
+        sprite->data[3] += sprite->data[1];
+        sprite->data[4] += sprite->data[2];
+        sprite->pos2.x += (sprite->data[3] >> 8);
+        sprite->pos2.y += (sprite->data[4] >> 8);
+        sprite->data[3] &= 0xFF;
+        sprite->data[4] &= 0xFF;
+
+        if (sprite->data[5] == 0)
+        {
+            if (sprite->pos1.x + sprite->pos2.x > 272)
+            {
+                sprite->callback = DestroyAnimSprite;
+            }
+        }
+        else if (sprite->pos1.x + sprite->pos2.x < -32)
+        {
+            sprite->callback = DestroyAnimSprite;
+        }
+    }
+}
+
+void sub_80DD490(struct Sprite *sprite)
+{
+    StartSpriteAnim(sprite, gBattleAnimArgs[4]);
+    sub_80787B0(sprite, 0);
+
+    sprite->data[0] = gBattleAnimArgs[3];
+    sprite->data[2] = sprite->pos1.x;
+    sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[2];
+
+    sprite->callback = sub_8078B34;
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
+}