Decompile battle_anim shock

6 files changed, 115 insertions, 275 deletions

diff --git a/asm/shock.s b/asm/shock.s
deleted file mode 100755
index 743aefe8a..000000000
--- a/asm/shock.s
+++ /dev/null
@@ -1,259 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	@ shock
-
-	thumb_func_start sub_80D6294
-sub_80D6294: @ 80D6294
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldr r4, _080D62D8 @ =gBattleAnimBankTarget
-	ldrb r0, [r4]
-	movs r1, 0x2
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x20]
-	ldrb r0, [r4]
-	movs r1, 0x3
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x22]
-	ldr r0, _080D62DC @ =gBattleAnimBankAttacker
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D62E4
-	ldr r2, _080D62E0 @ =gBattleAnimArgs
-	ldrh r0, [r5, 0x20]
-	ldrh r1, [r2]
-	subs r0, r1
-	strh r0, [r5, 0x20]
-	ldrh r0, [r5, 0x22]
-	ldrh r1, [r2, 0x2]
-	subs r0, r1
-	strh r0, [r5, 0x22]
-	b _080D62F8
-	.align 2, 0
-_080D62D8: .4byte gBattleAnimBankTarget
-_080D62DC: .4byte gBattleAnimBankAttacker
-_080D62E0: .4byte gBattleAnimArgs
-_080D62E4:
-	ldr r0, _080D631C @ =gBattleAnimArgs
-	ldrh r1, [r0]
-	ldrh r2, [r5, 0x20]
-	adds r1, r2
-	strh r1, [r5, 0x20]
-	ldrh r1, [r0, 0x2]
-	ldrh r2, [r5, 0x22]
-	adds r1, r2
-	strh r1, [r5, 0x22]
-	adds r2, r0, 0
-_080D62F8:
-	movs r0, 0
-	strh r0, [r5, 0x2E]
-	ldrh r0, [r2, 0x4]
-	strh r0, [r5, 0x30]
-	ldrh r0, [r2, 0x6]
-	strh r0, [r5, 0x32]
-	ldrh r0, [r2, 0x8]
-	strh r0, [r5, 0x34]
-	ldr r1, _080D6320 @ =move_anim_8074EE0
-	adds r0, r5, 0
-	bl StoreSpriteCallbackInData
-	ldr r0, _080D6324 @ =sub_8078114
-	str r0, [r5, 0x1C]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D631C: .4byte gBattleAnimArgs
-_080D6320: .4byte move_anim_8074EE0
-_080D6324: .4byte sub_8078114
-	thumb_func_end sub_80D6294
-
-	thumb_func_start sub_80D6328
-sub_80D6328: @ 80D6328
-	push {r4-r7,lr}
-	adds r5, r0, 0
-	ldr r0, _080D6340 @ =gBattleAnimArgs
-	movs r1, 0x8
-	ldrsh r0, [r0, r1]
-	cmp r0, 0x1
-	beq _080D63A0
-	cmp r0, 0x1
-	bgt _080D6344
-	cmp r0, 0
-	beq _080D634E
-	b _080D63A0
-	.align 2, 0
-_080D6340: .4byte gBattleAnimArgs
-_080D6344:
-	cmp r0, 0x2
-	beq _080D6358
-	cmp r0, 0x3
-	beq _080D637C
-	b _080D63A0
-_080D634E:
-	ldr r0, _080D6354 @ =gBattleAnimBankAttacker
-	b _080D63A2
-	.align 2, 0
-_080D6354: .4byte gBattleAnimBankAttacker
-_080D6358:
-	ldr r4, _080D6370 @ =gBattleAnimBankAttacker
-	ldrb r0, [r4]
-	movs r6, 0x2
-	eors r0, r6
-	bl IsAnimBankSpriteVisible
-	lsls r0, 24
-	cmp r0, 0
-	bne _080D6374
-	ldrb r4, [r4]
-	b _080D63A4
-	.align 2, 0
-_080D6370: .4byte gBattleAnimBankAttacker
-_080D6374:
-	ldrb r0, [r4]
-	adds r4, r6, 0
-	eors r4, r0
-	b _080D63A4
-_080D637C:
-	ldr r0, _080D6398 @ =gBattleAnimBankAttacker
-	ldrb r0, [r0]
-	movs r4, 0x2
-	eors r0, r4
-	bl IsAnimBankSpriteVisible
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D63A0
-	ldr r0, _080D639C @ =gBattleAnimBankTarget
-	ldrb r0, [r0]
-	eors r4, r0
-	b _080D63A4
-	.align 2, 0
-_080D6398: .4byte gBattleAnimBankAttacker
-_080D639C: .4byte gBattleAnimBankTarget
-_080D63A0:
-	ldr r0, _080D63C4 @ =gBattleAnimBankTarget
-_080D63A2:
-	ldrb r4, [r0]
-_080D63A4:
-	ldr r0, _080D63C8 @ =gBattleAnimArgs
-	movs r2, 0xA
-	ldrsh r0, [r0, r2]
-	cmp r0, 0
-	bne _080D63CC
-	adds r0, r4, 0
-	movs r1, 0
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x20]
-	adds r0, r4, 0
-	movs r1, 0x1
-	b _080D63DE
-	.align 2, 0
-_080D63C4: .4byte gBattleAnimBankTarget
-_080D63C8: .4byte gBattleAnimArgs
-_080D63CC:
-	adds r0, r4, 0
-	movs r1, 0x2
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x20]
-	adds r0, r4, 0
-	movs r1, 0x3
-_080D63DE:
-	bl sub_8077ABC
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x22]
-	ldr r7, _080D647C @ =gSineTable
-	ldr r6, _080D6480 @ =gBattleAnimArgs
-	movs r1, 0
-	ldrsh r0, [r6, r1]
-	lsls r0, 1
-	adds r0, r7
-	movs r2, 0
-	ldrsh r1, [r0, r2]
-	movs r2, 0x2
-	ldrsh r0, [r6, r2]
-	muls r0, r1
-	asrs r0, 8
-	strh r0, [r5, 0x24]
-	movs r1, 0
-	ldrsh r0, [r6, r1]
-	adds r0, 0x40
-	lsls r0, 1
-	adds r0, r7
-	movs r2, 0
-	ldrsh r1, [r0, r2]
-	movs r2, 0x2
-	ldrsh r0, [r6, r2]
-	muls r0, r1
-	asrs r0, 8
-	strh r0, [r5, 0x26]
-	ldrh r1, [r6, 0xC]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080D6442
-	adds r0, r4, 0
-	bl sub_8079ED4
-	lsls r0, 24
-	lsrs r0, 24
-	adds r0, 0x1
-	movs r1, 0x3
-	ands r0, r1
-	lsls r0, 2
-	ldrb r2, [r5, 0x5]
-	movs r1, 0xD
-	negs r1, r1
-	ands r1, r2
-	orrs r1, r0
-	strb r1, [r5, 0x5]
-_080D6442:
-	ldrb r2, [r5, 0x3]
-	lsls r2, 26
-	lsrs r2, 27
-	movs r0, 0x4
-	ldrsh r1, [r6, r0]
-	lsls r0, r1, 1
-	adds r0, r7
-	ldrh r0, [r0]
-	ldr r3, _080D6484 @ =gOamMatrices
-	lsls r2, 3
-	adds r2, r3
-	adds r1, 0x40
-	lsls r1, 1
-	adds r1, r7
-	ldrh r1, [r1]
-	strh r1, [r2, 0x6]
-	strh r1, [r2]
-	strh r0, [r2, 0x2]
-	lsls r0, 16
-	asrs r0, 16
-	negs r0, r0
-	strh r0, [r2, 0x4]
-	ldrh r0, [r6, 0x6]
-	strh r0, [r5, 0x2E]
-	ldr r0, _080D6488 @ =sub_80DA48C
-	str r0, [r5, 0x1C]
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D647C: .4byte gSineTable
-_080D6480: .4byte gBattleAnimArgs
-_080D6484: .4byte gOamMatrices
-_080D6488: .4byte sub_80DA48C
-	thumb_func_end sub_80D6328
-	
-	.align 2, 0 @ Don't pad with nop.
diff --git a/include/sprite.h b/include/sprite.h
index a87260ec0..29a0be562 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -222,6 +222,14 @@ struct Sprite
     /*0x43*/ u8 subpriority;
 };
 
+struct OamMatrix
+{
+    s16 a;
+    s16 b;
+    s16 c;
+    s16 d;
+};
+
 extern const struct OamData gDummyOamData;
 extern const union AnimCmd *const gDummySpriteAnimTable[];
 extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[];
diff --git a/ld_script.txt b/ld_script.txt
index 819e9be26..22c01bac3 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -286,7 +286,7 @@ SECTIONS {
         asm/wisp_fire.o(.text);
         src/battle/anim/thunder.o(.text);
         asm/beta_beat_up.o(.text);
-        asm/shock.o(.text);
+        src/battle/anim/shock.o(.text);
         asm/current.o(.text);
         asm/ice.o(.text);
         asm/fight.o(.text);
diff --git a/src/battle/anim/shock.c b/src/battle/anim/shock.c
new file mode 100644
index 000000000..35c380f23
--- /dev/null
+++ b/src/battle/anim/shock.c
@@ -0,0 +1,106 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "rom_8077ABC.h"
+#include "trig.h"
+
+extern s16 gBattleAnimArgs[8];
+extern u8 gBattleAnimBankAttacker;
+extern u8 gBattleAnimBankTarget;
+extern struct OamMatrix gOamMatrices[];
+
+extern void sub_80DA48C(struct Sprite *);
+
+// shock (moves the little electricity lines)
+// Used in Shock.
+
+void sub_80D6294(struct Sprite *sprite)
+{
+    sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2);
+    sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3);
+
+    if (GetBankSide(gBattleAnimBankAttacker) != 0)
+    {
+        sprite->pos1.x -= gBattleAnimArgs[0];
+        sprite->pos1.y -= gBattleAnimArgs[1];
+    }
+    else
+    {
+        sprite->pos1.x += gBattleAnimArgs[0];
+        sprite->pos1.y += gBattleAnimArgs[1];
+    }
+
+    sprite->data[0] = 0;
+    sprite->data[1] = gBattleAnimArgs[2];
+    sprite->data[2] = gBattleAnimArgs[3];
+    sprite->data[3] = gBattleAnimArgs[4];
+
+    StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
+    sprite->callback = sub_8078114;
+}
+
+void sub_80D6328(struct Sprite *sprite)
+{
+    u8 slot;
+    u32 matrixNum;
+    s16 sineVal;
+
+    switch (gBattleAnimArgs[4])
+    {
+    case 0:
+        slot = gBattleAnimBankAttacker;
+        break;
+    case 1:
+    default:
+        slot = gBattleAnimBankTarget;
+        break;
+    case 2:
+        if (!IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2))
+        {
+            slot = gBattleAnimBankAttacker;
+        }
+        else
+        {
+            slot = gBattleAnimBankAttacker ^ 2;
+        }
+        break;
+    case 3:
+        if (IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2))
+        {
+            slot = gBattleAnimBankTarget ^ 2;
+        }
+        else
+        {
+            slot = gBattleAnimBankTarget;
+        }
+        break;
+    }
+
+    if (gBattleAnimArgs[5] == 0)
+    {
+        sprite->pos1.x = sub_8077ABC(slot, 0);
+        sprite->pos1.y = sub_8077ABC(slot, 1);
+    }
+    else
+    {
+        sprite->pos1.x = sub_8077ABC(slot, 2);
+        sprite->pos1.y = sub_8077ABC(slot, 3);
+    }
+
+    sprite->pos2.x = (gSineTable[gBattleAnimArgs[0]] * gBattleAnimArgs[1]) >> 8;
+    sprite->pos2.y = (gSineTable[gBattleAnimArgs[0] + 64] * gBattleAnimArgs[1]) >> 8;
+
+    if (gBattleAnimArgs[6] & 1)
+    {
+        sprite->oam.priority = sub_8079ED4(slot) + 1;
+    }
+
+    matrixNum = sprite->oam.matrixNum;
+    sineVal = gSineTable[gBattleAnimArgs[2]];
+
+    gOamMatrices[matrixNum].a = gOamMatrices[matrixNum].d =  gSineTable[gBattleAnimArgs[2] + 64];
+    gOamMatrices[matrixNum].b =  sineVal;
+    gOamMatrices[matrixNum].c = -sineVal;
+
+    sprite->data[0] = gBattleAnimArgs[3];
+    sprite->callback = sub_80DA48C;
+}
diff --git a/src/engine/sprite.c b/src/engine/sprite.c
index 69fa860c1..c1bb36917 100644
--- a/src/engine/sprite.c
+++ b/src/engine/sprite.c
@@ -26,14 +26,6 @@
 
 #define SPRITE_TILE_IS_ALLOCATED(n) ((gSpriteTileAllocBitmap[(n) / 8] >> ((n) % 8)) & 1)
 
-struct OamMatrix
-{
-    s16 a;
-    s16 b;
-    s16 c;
-    s16 d;
-};
-
 struct SpriteCopyRequest
 {
     const u8 *src;
diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c
index ec7d5fdb8..0ecaa9dcb 100644
--- a/src/rom_8077ABC.c
+++ b/src/rom_8077ABC.c
@@ -51,13 +51,6 @@ struct Struct_gUnknown_0837F578 {
     u8 field_1;
 };
 
-struct OamMatrix {
-    s16 a;
-    s16 b;
-    s16 c;
-    s16 d;
-};
-
 struct Struct_2017810 {
     u8 filler_0[6];
     u8 field_6;