Start decompiling rock.s

3 files changed, 150 insertions, 359 deletions

diff --git a/asm/rock.s b/asm/rock.s
index 98afb53e6..853338ce0 100644
--- a/asm/rock.s
+++ b/asm/rock.s
@@ -7,365 +7,6 @@
 
 	@ rock
 
-	thumb_func_start sub_80DCE9C
-sub_80DCE9C: @ 80DCE9C
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	ldr r6, _080DCF08 @ =gBattleAnimArgs
-	movs r1, 0x6
-	ldrsh r0, [r6, r1]
-	cmp r0, 0
-	beq _080DCEBC
-	ldr r0, _080DCF0C @ =gAnimBankTarget
-	ldrb r0, [r0]
-	adds r2, r5, 0
-	adds r2, 0x20
-	adds r3, r5, 0
-	adds r3, 0x22
-	movs r1, 0
-	bl sub_807A3FC
-_080DCEBC:
-	ldrh r0, [r6]
-	ldrh r1, [r5, 0x20]
-	adds r0, r1
-	movs r4, 0
-	strh r0, [r5, 0x20]
-	ldrh r0, [r5, 0x22]
-	adds r0, 0xE
-	strh r0, [r5, 0x22]
-	ldrb r1, [r6, 0x2]
-	adds r0, r5, 0
-	bl StartSpriteAnim
-	adds r0, r5, 0
-	bl AnimateSprite
-	strh r4, [r5, 0x2E]
-	strh r4, [r5, 0x30]
-	movs r0, 0x4
-	strh r0, [r5, 0x32]
-	movs r0, 0x10
-	strh r0, [r5, 0x34]
-	ldr r0, _080DCF10 @ =0x0000ffba
-	strh r0, [r5, 0x36]
-	ldrh r0, [r6, 0x4]
-	strh r0, [r5, 0x38]
-	ldr r1, _080DCF14 @ =sub_80DCF1C
-	adds r0, r5, 0
-	bl StoreSpriteCallbackInData
-	ldr r1, _080DCF18 @ =sub_8078278
-	str r1, [r5, 0x1C]
-	adds r0, r5, 0
-	bl _call_via_r1
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DCF08: .4byte gBattleAnimArgs
-_080DCF0C: .4byte gAnimBankTarget
-_080DCF10: .4byte 0x0000ffba
-_080DCF14: .4byte sub_80DCF1C
-_080DCF18: .4byte sub_8078278
-	thumb_func_end sub_80DCE9C
-
-	thumb_func_start sub_80DCF1C
-sub_80DCF1C: @ 80DCF1C
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r1, [r4, 0x38]
-	ldrh r2, [r4, 0x20]
-	adds r0, r1, r2
-	strh r0, [r4, 0x20]
-	movs r0, 0xC0
-	strh r0, [r4, 0x2E]
-	strh r1, [r4, 0x30]
-	movs r0, 0x4
-	strh r0, [r4, 0x32]
-	movs r0, 0x20
-	strh r0, [r4, 0x34]
-	ldr r0, _080DCF54 @ =0x0000ffe8
-	strh r0, [r4, 0x36]
-	ldr r1, _080DCF58 @ =move_anim_8074EE0
-	adds r0, r4, 0
-	bl StoreSpriteCallbackInData
-	ldr r1, _080DCF5C @ =sub_8078278
-	str r1, [r4, 0x1C]
-	adds r0, r4, 0
-	bl _call_via_r1
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DCF54: .4byte 0x0000ffe8
-_080DCF58: .4byte move_anim_8074EE0
-_080DCF5C: .4byte sub_8078278
-	thumb_func_end sub_80DCF1C
-
-	thumb_func_start sub_80DCF60
-sub_80DCF60: @ 80DCF60
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldr r4, _080DCF88 @ =gBattleAnimArgs
-	ldrb r1, [r4, 0xA]
-	bl StartSpriteAnim
-	adds r0, r5, 0
-	bl AnimateSprite
-	ldr r0, _080DCF8C @ =gAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080DCF90
-	ldrh r0, [r5, 0x20]
-	ldrh r1, [r4]
-	subs r0, r1
-	b _080DCF96
-	.align 2, 0
-_080DCF88: .4byte gBattleAnimArgs
-_080DCF8C: .4byte gAnimBankAttacker
-_080DCF90:
-	ldrh r0, [r4]
-	ldrh r1, [r5, 0x20]
-	adds r0, r1
-_080DCF96:
-	strh r0, [r5, 0x20]
-	ldr r3, _080DCFD8 @ =gBattleAnimArgs
-	ldrh r2, [r3, 0x2]
-	ldrh r0, [r5, 0x22]
-	adds r2, r0
-	movs r4, 0
-	strh r2, [r5, 0x22]
-	ldrh r0, [r3, 0x8]
-	strh r0, [r5, 0x2E]
-	ldrh r0, [r5, 0x20]
-	strh r0, [r5, 0x30]
-	ldrh r1, [r3, 0x4]
-	adds r0, r1
-	strh r0, [r5, 0x32]
-	strh r2, [r5, 0x34]
-	ldrh r0, [r3, 0x6]
-	adds r2, r0
-	strh r2, [r5, 0x36]
-	adds r0, r5, 0
-	bl sub_8078A5C
-	strh r4, [r5, 0x34]
-	strh r4, [r5, 0x36]
-	ldr r0, _080DCFDC @ =sub_8078394
-	str r0, [r5, 0x1C]
-	ldr r1, _080DCFE0 @ =move_anim_8074EE0
-	adds r0, r5, 0
-	bl StoreSpriteCallbackInData
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DCFD8: .4byte gBattleAnimArgs
-_080DCFDC: .4byte sub_8078394
-_080DCFE0: .4byte move_anim_8074EE0
-	thumb_func_end sub_80DCF60
-
-	thumb_func_start sub_80DCFE4
-sub_80DCFE4: @ 80DCFE4
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r0, _080DCFFC @ =gBattleAnimArgs
-	movs r1, 0xC
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	bne _080DD000
-	adds r0, r4, 0
-	movs r1, 0
-	bl sub_80787B0
-	b _080DD008
-	.align 2, 0
-_080DCFFC: .4byte gBattleAnimArgs
-_080DD000:
-	adds r0, r4, 0
-	movs r1, 0
-	bl sub_8078764
-_080DD008:
-	ldr r1, _080DD024 @ =gBattleAnimArgs
-	ldrh r0, [r1, 0x6]
-	strh r0, [r4, 0x2E]
-	ldrh r0, [r1, 0x4]
-	strh r0, [r4, 0x30]
-	ldrh r0, [r1, 0x8]
-	strh r0, [r4, 0x32]
-	ldrh r0, [r1, 0xA]
-	strh r0, [r4, 0x34]
-	ldr r0, _080DD028 @ =sub_80DD02C
-	str r0, [r4, 0x1C]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DD024: .4byte gBattleAnimArgs
-_080DD028: .4byte sub_80DD02C
-	thumb_func_end sub_80DCFE4
-
-	thumb_func_start sub_80DD02C
-sub_80DD02C: @ 80DD02C
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r0, [r4, 0x30]
-	ldrh r1, [r4, 0x36]
-	adds r0, r1
-	strh r0, [r4, 0x36]
-	lsls r0, 16
-	asrs r0, 24
-	negs r0, r0
-	strh r0, [r4, 0x26]
-	movs r2, 0x38
-	ldrsh r0, [r4, r2]
-	movs r2, 0x34
-	ldrsh r1, [r4, r2]
-	bl Sin
-	strh r0, [r4, 0x24]
-	ldrh r0, [r4, 0x32]
-	ldrh r1, [r4, 0x38]
-	adds r0, r1
-	movs r1, 0xFF
-	ands r0, r1
-	strh r0, [r4, 0x38]
-	ldrh r0, [r4, 0x2E]
-	subs r0, 0x1
-	strh r0, [r4, 0x2E]
-	lsls r0, 16
-	asrs r0, 16
-	movs r1, 0x1
-	negs r1, r1
-	cmp r0, r1
-	bne _080DD072
-	adds r0, r4, 0
-	bl DestroyAnimSprite
-_080DD072:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DD02C
-
-	thumb_func_start do_boulder_dust
-do_boulder_dust: @ 80DD078
-	push {r4-r6,lr}
-	sub sp, 0x10
-	lsls r0, 24
-	lsrs r6, r0, 24
-	movs r5, 0
-	ldr r1, _080DD154 @ =REG_BLDCNT
-	ldr r2, _080DD158 @ =0x00003f42
-	adds r0, r2, 0
-	strh r0, [r1]
-	adds r1, 0x2
-	movs r2, 0x80
-	lsls r2, 5
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r4, _080DD15C @ =REG_BG1CNT
-	ldrb r1, [r4]
-	movs r0, 0x4
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x1
-	orrs r0, r1
-	strb r0, [r4]
-	ldrb r1, [r4, 0x1]
-	movs r0, 0x3F
-	ands r0, r1
-	strb r0, [r4, 0x1]
-	bl IsContest
-	lsls r0, 24
-	cmp r0, 0
-	bne _080DD0C4
-	ldrb r0, [r4]
-	movs r1, 0xD
-	negs r1, r1
-	ands r1, r0
-	movs r0, 0x4
-	orrs r1, r0
-	strb r1, [r4]
-_080DD0C4:
-	ldr r0, _080DD160 @ =gBattle_BG1_X
-	strh r5, [r0]
-	ldr r0, _080DD164 @ =gBattle_BG1_Y
-	strh r5, [r0]
-	ldr r0, _080DD168 @ =REG_BG1HOFS
-	strh r5, [r0]
-	adds r0, 0x2
-	strh r5, [r0]
-	mov r0, sp
-	bl sub_8078914
-	ldr r1, [sp, 0x4]
-	str r5, [sp, 0xC]
-	ldr r2, _080DD16C @ =0x040000d4
-	add r0, sp, 0xC
-	str r0, [r2]
-	str r1, [r2, 0x4]
-	ldr r0, _080DD170 @ =0x85000400
-	str r0, [r2, 0x8]
-	ldr r0, [r2, 0x8]
-	ldr r0, _080DD174 @ =gBattleAnimBackgroundTilemap_SandstormBrew
-	bl LZDecompressVram
-	ldr r0, _080DD178 @ =gBattleAnimBackgroundImage_SandstormBrew
-	ldr r1, [sp]
-	bl LZDecompressVram
-	ldr r0, _080DD17C @ =gBattleAnimSpritePalette_261
-	mov r1, sp
-	ldrb r1, [r1, 0x8]
-	lsls r1, 4
-	movs r2, 0x20
-	bl LoadCompressedPalette
-	bl IsContest
-	lsls r0, 24
-	cmp r0, 0
-	beq _080DD120
-	mov r0, sp
-	ldrb r0, [r0, 0x8]
-	ldr r1, [sp, 0x4]
-	movs r2, 0
-	movs r3, 0
-	bl sub_80763FC
-_080DD120:
-	ldr r0, _080DD180 @ =gBattleAnimArgs
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	beq _080DD13A
-	ldr r0, _080DD184 @ =gAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080DD13A
-	movs r5, 0x1
-_080DD13A:
-	ldr r0, _080DD188 @ =gTasks
-	lsls r1, r6, 2
-	adds r1, r6
-	lsls r1, 3
-	adds r1, r0
-	strh r5, [r1, 0x8]
-	ldr r0, _080DD18C @ =sub_80DD190
-	str r0, [r1]
-	add sp, 0x10
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DD154: .4byte REG_BLDCNT
-_080DD158: .4byte 0x00003f42
-_080DD15C: .4byte REG_BG1CNT
-_080DD160: .4byte gBattle_BG1_X
-_080DD164: .4byte gBattle_BG1_Y
-_080DD168: .4byte REG_BG1HOFS
-_080DD16C: .4byte 0x040000d4
-_080DD170: .4byte 0x85000400
-_080DD174: .4byte gBattleAnimBackgroundTilemap_SandstormBrew
-_080DD178: .4byte gBattleAnimBackgroundImage_SandstormBrew
-_080DD17C: .4byte gBattleAnimSpritePalette_261
-_080DD180: .4byte gBattleAnimArgs
-_080DD184: .4byte gAnimBankAttacker
-_080DD188: .4byte gTasks
-_080DD18C: .4byte sub_80DD190
-	thumb_func_end do_boulder_dust
-
 	thumb_func_start sub_80DD190
 sub_80DD190: @ 80DD190
 	push {r4-r7,lr}
diff --git a/ld_script.txt b/ld_script.txt
index fc13444f1..d37b73e6d 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -295,6 +295,7 @@ SECTIONS {
         asm/flying.o(.text);
         asm/psychic.o(.text);
         src/battle/anim/bug.o(.text);
+        src/battle/anim/rock.o(.text);
         asm/rock.o(.text);
         asm/ghost.o(.text);
         src/battle/anim/dragon.o(.text);
diff --git a/src/battle/anim/rock.c b/src/battle/anim/rock.c
new file mode 100644
index 000000000..d4307e7c1
--- /dev/null
+++ b/src/battle/anim/rock.c
@@ -0,0 +1,149 @@
+#include "global.h"
+#include "battle.h"
+#include "battle_anim.h"
+#include "decompress.h"
+#include "palette.h"
+#include "rom_8077ABC.h"
+#include "task.h"
+#include "trig.h"
+
+extern s16 gBattleAnimArgs[];
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
+extern u16 gBattle_BG1_X;
+extern u16 gBattle_BG1_Y;
+
+extern const u8 gBattleAnimBackgroundTilemap_SandstormBrew[];
+extern const u8 gBattleAnimBackgroundImage_SandstormBrew[];
+extern const u16 gBattleAnimSpritePalette_261[];
+
+static void sub_80DCF1C(struct Sprite *sprite);
+static void sub_80DD02C(struct Sprite *sprite);
+void sub_80DD190(u8 taskId);
+
+
+void sub_80DCE9C(struct Sprite *sprite)
+{
+    if (gBattleAnimArgs[3] != 0)
+        sub_807A3FC(gAnimBankTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
+
+    sprite->pos1.x += gBattleAnimArgs[0];
+    sprite->pos1.y += 14;
+
+    StartSpriteAnim(sprite, gBattleAnimArgs[1]);
+    AnimateSprite(sprite);
+
+    sprite->data[0] = 0;
+    sprite->data[1] = 0;
+    sprite->data[2] = 4;
+    sprite->data[3] = 16;
+    sprite->data[4] = -70;
+    sprite->data[5] = gBattleAnimArgs[2];
+
+    StoreSpriteCallbackInData(sprite, sub_80DCF1C);
+    sprite->callback = sub_8078278;
+    sprite->callback(sprite);
+}
+
+static void sub_80DCF1C(struct Sprite *sprite)
+{
+    sprite->pos1.x += sprite->data[5];
+
+    sprite->data[0] = 192;
+    sprite->data[1] = sprite->data[5];
+    sprite->data[2] = 4;
+    sprite->data[3] = 32;
+    sprite->data[4] = -24;
+
+    StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
+    sprite->callback = sub_8078278;
+    sprite->callback(sprite);
+}
+
+void sub_80DCF60(struct Sprite *sprite)
+{
+    StartSpriteAnim(sprite, gBattleAnimArgs[5]);
+    AnimateSprite(sprite);
+
+    if (GetBankSide(gAnimBankAttacker) != SIDE_PLAYER)
+        sprite->pos1.x -= gBattleAnimArgs[0];
+    else
+        sprite->pos1.x += gBattleAnimArgs[0];
+
+    sprite->pos1.y += gBattleAnimArgs[1];
+
+    sprite->data[0] = gBattleAnimArgs[4];
+    sprite->data[1] = sprite->pos1.x;
+    sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2];
+    sprite->data[3] = sprite->pos1.y;
+    sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[3];
+
+    sub_8078A5C(sprite);
+    sprite->data[3] = 0;
+    sprite->data[4] = 0;
+
+    sprite->callback = sub_8078394;
+    StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
+}
+
+void sub_80DCFE4(struct Sprite *sprite)
+{
+    if (gBattleAnimArgs[6] == 0)
+        sub_80787B0(sprite, 0);
+    else
+        sub_8078764(sprite, 0);
+
+    sprite->data[0] = gBattleAnimArgs[3];
+    sprite->data[1] = gBattleAnimArgs[2];
+    sprite->data[2] = gBattleAnimArgs[4];
+    sprite->data[3] = gBattleAnimArgs[5];
+
+    sprite->callback = sub_80DD02C;
+}
+
+static void sub_80DD02C(struct Sprite *sprite)
+{
+    sprite->data[4] += sprite->data[1];
+    sprite->pos2.y = -(sprite->data[4] >> 8);
+    sprite->pos2.x = Sin(sprite->data[5], sprite->data[3]);
+    sprite->data[5] = (sprite->data[5] + sprite->data[2]) & 0xFF;
+
+    if (--sprite->data[0] == -1)
+    {
+        DestroyAnimSprite(sprite);
+    }
+}
+
+void do_boulder_dust(u8 taskId)
+{
+    struct Struct_sub_8078914 subStruct;
+    int var0 = 0;
+
+    REG_BLDCNT = 0x3F42;
+    REG_BLDALPHA = 0x1000;
+    REG_BG1CNT_BITFIELD.priority = 1;
+    REG_BG1CNT_BITFIELD.screenSize = 0;
+
+    if (!IsContest())
+        REG_BG1CNT_BITFIELD.charBaseBlock = 1;
+
+    gBattle_BG1_X = 0;
+    gBattle_BG1_Y = 0;
+    REG_BG1HOFS = 0;
+    REG_BG1VOFS = 0;
+
+    sub_8078914(&subStruct);
+    DmaFill32Defvars(3, 0, subStruct.field_4, 0x1000);
+    LZDecompressVram(&gBattleAnimBackgroundTilemap_SandstormBrew, subStruct.field_4);
+    LZDecompressVram(&gBattleAnimBackgroundImage_SandstormBrew, subStruct.field_0);
+    LoadCompressedPalette(&gBattleAnimSpritePalette_261, subStruct.field_8 << 4, 32);
+
+    if (IsContest())
+        sub_80763FC(subStruct.field_8, (u16 *)subStruct.field_4, 0, 0);
+
+    if (gBattleAnimArgs[0] != 0 && GetBankSide(gAnimBankAttacker) != SIDE_PLAYER)
+        var0 = 1;
+
+    gTasks[taskId].data[0] = var0;
+    gTasks[taskId].func = sub_80DD190;
+}