summaryrefslogtreecommitdiff
path: root/src/battle/anim/ice.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle/anim/ice.c')
-rw-r--r--src/battle/anim/ice.c939
1 files changed, 104 insertions, 835 deletions
diff --git a/src/battle/anim/ice.c b/src/battle/anim/ice.c
index e41057d72..438c61f9f 100644
--- a/src/battle/anim/ice.c
+++ b/src/battle/anim/ice.c
@@ -26,6 +26,7 @@ extern struct INCBIN_U8 gBattleAnimFogTilemap;
extern struct INCBIN_U8 gWeatherFog1Tiles;
static void sub_80D7704(struct Sprite *sprite);
+static void sub_80D7888(struct Sprite *sprite);
static void AnimIcePunchSwirlingParticle(struct Sprite *sprite);
static void AnimIceBeamParticle(struct Sprite *sprite);
static void AnimIceEffectParticle(struct Sprite *sprite);
@@ -53,7 +54,15 @@ static void AnimIceBallParticle(struct Sprite *sprite);
static void AnimTask_Haze2(u8 taskId);
static void AnimTask_OverlayFogTiles(u8 taskId);
static void AnimTask_Hail2(u8 taskId);
-bool8 sub_80D8BA8(u8 a1, u8 a2, u8 a3, u8 a4);
+bool8 sub_80D8BA8(u8 hailStructId, u8 affineAnimNum, u8 taskId, u8 c);
+
+struct HailStruct
+{
+ s32 x:10;
+ s32 y:10;
+ s32 bPosition:8;
+ s32 unk3:4;
+};
const union AnimCmd gSpriteAnim_83D9B58[] =
{
@@ -374,18 +383,18 @@ const struct SpriteTemplate gPoisonGasCloudSpriteTemplate =
.callback = InitPoisonGasCloudAnim,
};
-const u8 gUnknown_083D9DC4[][4] =
-{
- {0x64, 0xE0, 0x01, 0x20},
- {0x55, 0xE0, 0x01, 0x00},
- {0xF2, 0xE0, 0x11, 0x10},
- {0x42, 0xE0, 0x21, 0x10},
- {0xB6, 0xE0, 0x31, 0x00},
- {0x3C, 0xE0, 0x01, 0x20},
- {0xD6, 0xE0, 0x11, 0x00},
- {0x71, 0xE0, 0x01, 0x10},
- {0xD2, 0xE0, 0x31, 0x10},
- {0x26, 0xE0, 0x21, 0x00},
+const struct HailStruct gUnknown_083D9DC4[] =
+{
+ {.x = 100, .y = 120, .bPosition = B_POSITION_PLAYER_LEFT, .unk3 = 2},
+ {.x = 85, .y = 120, .bPosition = B_POSITION_PLAYER_LEFT, .unk3 = 0},
+ {.x = 242, .y = 120, .bPosition = B_POSITION_OPPONENT_LEFT, .unk3 = 1},
+ {.x = 66, .y = 120, .bPosition = B_POSITION_PLAYER_RIGHT, .unk3 = 1},
+ {.x = 182, .y = 120, .bPosition = B_POSITION_OPPONENT_RIGHT, .unk3 = 0},
+ {.x = 60, .y = 120, .bPosition = B_POSITION_PLAYER_LEFT, .unk3 = 2},
+ {.x = 214, .y = 120, .bPosition = B_POSITION_OPPONENT_LEFT, .unk3 = 0},
+ {.x = 113, .y = 120, .bPosition = B_POSITION_PLAYER_LEFT, .unk3 = 1},
+ {.x = 210, .y = 120, .bPosition = B_POSITION_OPPONENT_RIGHT, .unk3 = 1},
+ {.x = 38, .y = 120, .bPosition = B_POSITION_PLAYER_RIGHT, .unk3 = 0},
};
const union AffineAnimCmd gSpriteAffineAnim_83D9DEC[] =
@@ -528,266 +537,46 @@ const struct SpriteTemplate gIceBallParticleSpriteTemplate =
.callback = InitIceBallParticle,
};
-// unknown - potentially used in weather ball
-// TODO: decompile function and name it
-/*
-// NOT EQUIVALENT
static void sub_80D7704(struct Sprite *sprite)
{
- //
- //u16 battler1, battler2, battler3, battler4; //
- u16 r9, r8, r3, r6;
- //s16 r4, r10;
+ s16 targetX, targetY, attackerX, attackerY;
sprite->oam.tileNum += 7;
-
- //u8 battler1, battler2, battler3, battler4;
-
- //battler1 = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
- //battler2 = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
- //battler3 = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
- //battler4 = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
-
- //sprite->oam.tileNum += 7;
-
- //sprite->data[0] = gBattleAnimArgs[4];
-
- //sprite->data[1] = battler3 + gBattleAnimArgs[0]; //???
- //sprite->data[2] = battler1 + gBattleAnimArgs[2];
- //sprite->data[3] = battler4 + gBattleAnimArgs[1];
- //sprite->data[4] = battler2 + gBattleAnimArgs[3];
-
- r9 = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
- r8 = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
- r3 = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
- r6 = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
-
+ targetX = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
+ targetY = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
+ attackerX = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+ attackerY = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
sprite->data[0] = gBattleAnimArgs[4];
+ sprite->data[1] = gBattleAnimArgs[0] + attackerX;
+ sprite->data[2] = gBattleAnimArgs[2] + targetX;
+ sprite->data[3] = gBattleAnimArgs[1] + attackerY;
+ sprite->data[4] = gBattleAnimArgs[3] + targetY;
+ sub_8078314(sprite);
- sprite->data[1] = r3 + gBattleAnimArgs[0]; //???
- sprite->data[2] = r9 + gBattleAnimArgs[2];
- sprite->data[3] = r6 + gBattleAnimArgs[1];
- sprite->data[4] = r8 + gBattleAnimArgs[3];
-
- //sprite->data[0] = gBattleAnimArgs;
+ for (;(targetX >= -32 && targetX <= 272) && (targetY >= -32 && targetY <= 192);
+ targetX += sprite->data[1], targetY += sprite->data[2])
+ ;
+ sprite->data[1] = -sprite->data[1];
+ sprite->data[2] = -sprite->data[2];
+ for (;(attackerX >= -32 && attackerX <= 272) && (attackerY >= -32 && attackerY <= 192);
+ attackerX += sprite->data[1], attackerY += sprite->data[2])
+ ;
+ sprite->pos1.x = attackerX;
+ sprite->pos1.y = attackerY;
+ sprite->data[0] = gBattleAnimArgs[4];
+ sprite->data[1] = attackerX;
+ sprite->data[2] = targetX;
+ sprite->data[3] = attackerY;
+ sprite->data[4] = targetY;
sub_8078314(sprite);
-
- if ((u32)(r9 + 32) <= 304 || (u32)(r8 + 32) <= 224) // cmp 1
- {
- r4 = sprite->data[1];
- r10 = 304;
-
- // _080D77AA
- for (int i = 0; i < 3; i++)
- {
- //
- if (((u32)((s16)r9 + r4) + (0x80 << 14)) >> 16 > 304
- || ((u32)((s16)r8 + r4) + (0x80 << 14)) >> 16 > 0xE0)
- {
- break;
- }
- }
- }
- // _080D77DE
-}
-*/
-
-NAKED static void sub_80D7704(struct Sprite *sprite)
-{
- asm_unified("\tpush {r4-r7,lr}\n"
- "\tmov r7, r10\n"
- "\tmov r6, r9\n"
- "\tmov r5, r8\n"
- "\tpush {r5-r7}\n"
- "\tsub sp, 0x4\n"
- "\tadds r5, r0, 0\n"
- "\tldrh r2, [r5, 0x4]\n"
- "\tlsls r1, r2, 22\n"
- "\tlsrs r1, 22\n"
- "\tadds r1, 0x7\n"
- "\tldr r3, _080D780C @ =0x000003ff\n"
- "\tadds r0, r3, 0\n"
- "\tands r1, r0\n"
- "\tldr r0, _080D7810 @ =0xfffffc00\n"
- "\tands r0, r2\n"
- "\torrs r0, r1\n"
- "\tstrh r0, [r5, 0x4]\n"
- "\tldr r4, _080D7814 @ =gBattleAnimTarget\n"
- "\tldrb r0, [r4]\n"
- "\tmovs r1, 0x2\n"
- "\tbl GetBattlerSpriteCoord\n"
- "\tlsls r0, 24\n"
- "\tlsrs r0, 24\n"
- "\tmov r9, r0\n"
- "\tldrb r0, [r4]\n"
- "\tmovs r1, 0x3\n"
- "\tbl GetBattlerSpriteCoord\n"
- "\tlsls r0, 24\n"
- "\tlsrs r0, 24\n"
- "\tmov r8, r0\n"
- "\tldr r4, _080D7818 @ =gBattleAnimAttacker\n"
- "\tldrb r0, [r4]\n"
- "\tmovs r1, 0x2\n"
- "\tbl GetBattlerSpriteCoord\n"
- "\tlsls r0, 24\n"
- "\tlsrs r3, r0, 24\n"
- "\tldrb r0, [r4]\n"
- "\tmovs r1, 0x3\n"
- "\tstr r3, [sp]\n"
- "\tbl GetBattlerSpriteCoord\n"
- "\tlsls r0, 24\n"
- "\tlsrs r6, r0, 24\n"
- "\tldr r1, _080D781C @ =gBattleAnimArgs\n"
- "\tldrh r0, [r1, 0x8]\n"
- "\tstrh r0, [r5, 0x2E]\n"
- "\tldrh r0, [r1]\n"
- "\tldr r3, [sp]\n"
- "\tadds r0, r3\n"
- "\tstrh r0, [r5, 0x30]\n"
- "\t ldrh r0, [r1, 0x4]\n"
- "\t mov r4, r9\n"
- "\t adds r0, r4, r0\n"
- "\tstrh r0, [r5, 0x32]\n"
- "\tldrh r0, [r1, 0x2]\n"
- "\tadds r0, r6\n"
- "\tstrh r0, [r5, 0x34]\n"
- "\tldrh r0, [r1, 0x6]\n"
- "\tmov r7, r8\n"
- "\tadds r0, r7, r0\n"
- "\tstrh r0, [r5, 0x36]\n"
- "\tadds r0, r5, 0\n"
- "\tbl sub_8078314\n"
- "\tadds r4, 0x20\n"
- "\tmovs r0, 0x98\n"
- "\tlsls r0, 1\n"
- "\tmov r12, r0\n"
- "\tldr r3, [sp]\n"
- "\tcmp r4, r12\n"
- "\tbhi _080D77DE\n"
- "\tadds r0, r7, 0\n"
- "\tadds r0, 0x20\n"
- "\tldrh r1, [r5, 0x30]\n"
- "\tldrh r2, [r5, 0x32]\n"
- "\tcmp r0, 0xE0\n"
- "\tbhi _080D77DE\n"
- "\tadds r4, r1, 0\n"
- "\tmov r10, r12\n"
- "_080D77AA:\n"
- "\tmov r7, r9\n"
- "\tlsls r1, r7, 16\n"
- "\tasrs r1, 16\n"
- "\tadds r1, r4\n"
- "\tlsls r1, 16\n"
- "\tmov r7, r8\n"
- "\tlsls r0, r7, 16\n"
- "\tasrs r0, 16\n"
- "\tadds r0, r2\n"
- "\tlsls r0, 16\n"
- "\tlsrs r0, 16\n"
- "\tmov r8, r0\n"
- "\tlsrs r0, r1, 16\n"
- "\tmov r9, r0\n"
- "\tmovs r7, 0x80\n"
- "\tlsls r7, 14\n"
- "\tadds r1, r7\n"
- "\tlsrs r1, 16\n"
- "\tcmp r1, r10\n"
- "\tbhi _080D77DE\n"
- "\tmov r1, r8\n"
- "\tlsls r0, r1, 16\n"
- "\tadds r0, r7\n"
- "\tlsrs r0, 16\n"
- "\tcmp r0, 0xE0\n"
- "\tbls _080D77AA\n"
- "_080D77DE:\n"
- "\tldrh r0, [r5, 0x30]\n"
- "\tnegs r7, r0\n"
- "\tstrh r7, [r5, 0x30]\n"
- "\tldrh r0, [r5, 0x32]\n"
- "\tnegs r4, r0\n"
- "\tstrh r4, [r5, 0x32]\n"
- "\tlsls r0, r3, 16\n"
- "\tmovs r1, 0x80\n"
- "\tlsls r1, 14\n"
- "\tadds r0, r1\n"
- "\tlsrs r0, 16\n"
- "\tmovs r2, 0x98\n"
- "\tlsls r2, 1\n"
- "\tmov r12, r2\n"
- "\tldr r1, _080D781C @ =gBattleAnimArgs\n"
- "\tmov r10, r1\n"
- "\tcmp r0, r12\n"
- "\tbhi _080D784A\n"
- "\tlsls r1, r6, 16\n"
- "\tmovs r2, 0x80\n"
- "\tlsls r2, 14\n"
- "\tadds r0, r1, r2\n"
- "\tb _080D7842\n"
- "\t.align 2, 0\n"
- "_080D780C: .4byte 0x000003ff\n"
- "_080D7810: .4byte 0xfffffc00\n"
- "_080D7814: .4byte gBattleAnimTarget\n"
- "_080D7818: .4byte gBattleAnimAttacker\n"
- "_080D781C: .4byte gBattleAnimArgs\n"
- "_080D7820:\n"
- "\tlsls r1, r3, 16\n"
- "\tasrs r1, 16\n"
- "\tadds r1, r7\n"
- "\tlsls r1, 16\n"
- "\tasrs r0, r2, 16\n"
- "\tadds r0, r4\n"
- "\tlsls r0, 16\n"
- "\tlsrs r6, r0, 16\n"
- "\tlsrs r3, r1, 16\n"
- "\tmovs r0, 0x80\n"
- "\tlsls r0, 14\n"
- "\tadds r1, r0\n"
- "\tlsrs r1, 16\n"
- "\tcmp r1, r12\n"
- "\tbhi _080D784A\n"
- "\tlsls r1, r6, 16\n"
- "\tadds r0, r1, r0\n"
- "_080D7842:\n"
- "\tlsrs r0, 16\n"
- "\tadds r2, r1, 0\n"
- "\tcmp r0, 0xE0\n"
- "\tbls _080D7820\n"
- "_080D784A:\n"
- "\tstrh r3, [r5, 0x20]\n"
- "\tstrh r6, [r5, 0x22]\n"
- "\tmov r1, r10\n"
- "\tldrh r0, [r1, 0x8]\n"
- "\tstrh r0, [r5, 0x2E]\n"
- "\tstrh r3, [r5, 0x30]\n"
- "\tmov r2, r9\n"
- "\tstrh r2, [r5, 0x32]\n"
- "\tstrh r6, [r5, 0x34]\n"
- "\tmov r3, r8\n"
- "\tstrh r3, [r5, 0x36]\n"
- "\tadds r0, r5, 0\n"
- "\tbl sub_8078314\n"
- "\tmov r7, r10\n"
- "\tldrh r0, [r7, 0xA]\n"
- "\tstrh r0, [r5, 0x34]\n"
- "\tldrh r0, [r7, 0xC]\n"
- "\tstrh r0, [r5, 0x36]\n"
- "\tldr r0, _080D7884 @ =sub_80D7888\n"
- "\tstr r0, [r5, 0x1C]\n"
- "\tadd sp, 0x4\n"
- "\tpop {r3-r5}\n"
- "\tmov r8, r3\n"
- "\tmov r9, r4\n"
- "\tmov r10, r5\n"
- "\tpop {r4-r7}\n"
- "\tpop {r0}\n"
- "\tbx r0\n"
- "\t.align 2, 0\n"
- "_080D7884: .4byte sub_80D7888");
+ sprite->data[3] = gBattleAnimArgs[5];
+ sprite->data[4] = gBattleAnimArgs[6];
+ sprite->callback = sub_80D7888;
}
-void sub_80D7888(struct Sprite *sprite)
+static void sub_80D7888(struct Sprite *sprite)
{
if (sprite->data[0] != 0)
{
@@ -1460,13 +1249,9 @@ static void InitPoisonGasCloudAnim(struct Sprite *sprite)
}
// Animates the gas clouds towards the target mon in Poison Gas.
-// functionally correct, but there appears to be an unused local variable causing
-// switch case 1 to not match
-#ifdef NONMATCHING
static void sub_80D8874(struct Sprite *sprite)
{
int value;
- register s16 value2 asm("r5");
switch (sprite->data[7] & 0xFF)
{
@@ -1481,19 +1266,20 @@ static void sub_80D8874(struct Sprite *sprite)
if (sprite->data[0] <= 0)
{
- value2 = 80;
- sprite->data[0] = value2;
- sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
+ sprite->data[0] = 80;
+ sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X);
sprite->data[1] = sprite->pos1.x;
sprite->data[2] = sprite->pos1.x;
sprite->pos1.y += sprite->pos2.y;
sprite->data[3] = sprite->pos1.y;
sprite->data[4] = sprite->pos1.y + 29;
sprite->data[7]++;
- if (gMain.inBattle && gBattlerPositions[gBattleAnimTarget] & 1)
+ if (!gMain.inBattle)
+ sprite->data[5] = 80;
+ else if (gBattlerPositions[gBattleAnimTarget] & 1)
sprite->data[5] = 204;
else
- sprite->data[5] = value2;
+ sprite->data[5] = 80;
sprite->pos2.y = 0;
value = gSineTable[sprite->data[5]];
@@ -1530,12 +1316,13 @@ static void sub_80D8874(struct Sprite *sprite)
if (sprite->data[0] <= 0)
{
- asm("mov r2, #0"); // unused local variable?
sprite->data[0] = 0x300;
sprite->data[1] = sprite->pos1.x += sprite->pos2.x;
sprite->data[3] = sprite->pos1.y += sprite->pos2.y;
sprite->data[4] = sprite->pos1.y + 4;
- if (gMain.inBattle && gBattlerPositions[gBattleAnimTarget] & 1)
+ if (!gMain.inBattle)
+ sprite->data[2] = -0x10;
+ else if (gBattlerPositions[gBattleAnimTarget] & 1)
sprite->data[2] = 0x100;
else
sprite->data[2] = -0x10;
@@ -1560,321 +1347,6 @@ static void sub_80D8874(struct Sprite *sprite)
break;
}
}
-#else
-NAKED static void sub_80D8874(struct Sprite *sprite)
-{
- asm_unified("\tpush {r4-r6,lr}\n"
- "\tadds r4, r0, 0\n"
- "\tldrh r0, [r4, 0x3C]\n"
- "\tmovs r5, 0xFF\n"
- "\tmovs r1, 0xFF\n"
- "\tands r1, r0\n"
- "\tcmp r1, 0x1\n"
- "\tbeq _080D8968\n"
- "\tcmp r1, 0x1\n"
- "\tbgt _080D888E\n"
- "\tcmp r1, 0\n"
- "\tbeq _080D8896\n"
- "\tb _080D8AD0\n"
- "_080D888E:\n"
- "\tcmp r1, 0x2\n"
- "\tbne _080D8894\n"
- "\tb _080D8A94\n"
- "_080D8894:\n"
- "\tb _080D8AD0\n"
- "_080D8896:\n"
- "\tadds r0, r4, 0\n"
- "\tbl TranslateAnimLinear\n"
- "\tldr r1, _080D88C0 @ =gSineTable\n"
- "\tmovs r2, 0x38\n"
- "\tldrsh r0, [r4, r2]\n"
- "\tlsls r0, 1\n"
- "\tadds r0, r1\n"
- "\tmovs r1, 0\n"
- "\tldrsh r0, [r0, r1]\n"
- "\tasrs r0, 4\n"
- "\tldrh r2, [r4, 0x24]\n"
- "\tadds r0, r2\n"
- "\tstrh r0, [r4, 0x24]\n"
- "\tmovs r1, 0x3A\n"
- "\tldrsh r0, [r4, r1]\n"
- "\tcmp r0, 0\n"
- "\tbeq _080D88C4\n"
- "\tldrh r0, [r4, 0x38]\n"
- "\tsubs r0, 0x8\n"
- "\tb _080D88C8\n"
- "\t.align 2, 0\n"
- "_080D88C0: .4byte gSineTable\n"
- "_080D88C4:\n"
- "\tldrh r0, [r4, 0x38]\n"
- "\tadds r0, 0x8\n"
- "_080D88C8:\n"
- "\tands r0, r5\n"
- "\tstrh r0, [r4, 0x38]\n"
- "\tmovs r2, 0x2E\n"
- "\tldrsh r0, [r4, r2]\n"
- "\tcmp r0, 0\n"
- "\tble _080D88D6\n"
- "\tb _080D8AD0\n"
- "_080D88D6:\n"
- "\tmovs r5, 0x50\n"
- "\tstrh r5, [r4, 0x2E]\n"
- "\tldr r6, _080D8928 @ =gBattleAnimTarget\n"
- "\tldrb r0, [r6]\n"
- "\tmovs r1, 0\n"
- "\tbl GetBattlerSpriteCoord\n"
- "\tlsls r0, 24\n"
- "\tlsrs r0, 24\n"
- "\tstrh r0, [r4, 0x20]\n"
- "\tstrh r0, [r4, 0x30]\n"
- "\tstrh r0, [r4, 0x32]\n"
- "\tldrh r0, [r4, 0x26]\n"
- "\tldrh r1, [r4, 0x22]\n"
- "\tadds r0, r1\n"
- "\tstrh r0, [r4, 0x22]\n"
- "\tstrh r0, [r4, 0x34]\n"
- "\tadds r0, 0x1D\n"
- "\tstrh r0, [r4, 0x36]\n"
- "\tldrh r0, [r4, 0x3C]\n"
- "\tadds r0, 0x1\n"
- "\tstrh r0, [r4, 0x3C]\n"
- "\tldr r0, _080D892C @ =gMain\n"
- "\tldr r2, _080D8930 @ =0x0000043d\n"
- "\tadds r0, r2\n"
- "\tldrb r1, [r0]\n"
- "\tmovs r0, 0x2\n"
- "\tands r0, r1\n"
- "\tcmp r0, 0\n"
- "\tbeq _080D8938\n"
- "\tldr r1, _080D8934 @ =gBattlerPositions\n"
- "\tldrb r0, [r6]\n"
- "\tadds r0, r1\n"
- "\tldrb r1, [r0]\n"
- "\tmovs r0, 0x1\n"
- "\tands r0, r1\n"
- "\tcmp r0, 0\n"
- "\tbeq _080D8938\n"
- "\tmovs r0, 0xCC\n"
- "\tstrh r0, [r4, 0x38]\n"
- "\tb _080D893A\n"
- "\t.align 2, 0\n"
- "_080D8928: .4byte gBattleAnimTarget\n"
- "_080D892C: .4byte gMain\n"
- "_080D8930: .4byte 0x0000043d\n"
- "_080D8934: .4byte gBattlerPositions\n"
- "_080D8938:\n"
- "\tstrh r5, [r4, 0x38]\n"
- "_080D893A:\n"
- "\tmovs r0, 0\n"
- "\tstrh r0, [r4, 0x26]\n"
- "\tldr r1, _080D8964 @ =gSineTable\n"
- "\tmovs r2, 0x38\n"
- "\tldrsh r0, [r4, r2]\n"
- "\tlsls r0, 1\n"
- "\tadds r0, r1\n"
- "\tmovs r1, 0\n"
- "\tldrsh r0, [r0, r1]\n"
- "\tasrs r0, 3\n"
- "\tstrh r0, [r4, 0x24]\n"
- "\tldrh r0, [r4, 0x38]\n"
- "\tadds r0, 0x2\n"
- "\tmovs r1, 0xFF\n"
- "\tands r0, r1\n"
- "\tstrh r0, [r4, 0x38]\n"
- "\tadds r0, r4, 0\n"
- "\tbl InitAnimLinearTranslation\n"
- "\tb _080D8AD0\n"
- "\t.align 2, 0\n"
- "_080D8964: .4byte gSineTable\n"
- "_080D8968:\n"
- "\tadds r0, r4, 0\n"
- "\tbl TranslateAnimLinear\n"
- "\tldr r1, _080D89C8 @ =gSineTable\n"
- "\tmovs r2, 0x38\n"
- "\tldrsh r0, [r4, r2]\n"
- "\tlsls r0, 1\n"
- "\tadds r0, r1\n"
- "\tmovs r2, 0\n"
- "\tldrsh r0, [r0, r2]\n"
- "\tasrs r0, 3\n"
- "\tldrh r2, [r4, 0x24]\n"
- "\tadds r0, r2\n"
- "\tstrh r0, [r4, 0x24]\n"
- "\tmovs r2, 0x38\n"
- "\tldrsh r0, [r4, r2]\n"
- "\tadds r0, 0x40\n"
- "\tlsls r0, 1\n"
- "\tadds r0, r1\n"
- "\tmovs r2, 0\n"
- "\tldrsh r1, [r0, r2]\n"
- "\tlsls r0, r1, 1\n"
- "\tadds r0, r1\n"
- "\tnegs r0, r0\n"
- "\tasrs r0, 8\n"
- "\tldrh r1, [r4, 0x26]\n"
- "\tadds r0, r1\n"
- "\tstrh r0, [r4, 0x26]\n"
- "\tldr r0, _080D89CC @ =gMain\n"
- "\tldr r2, _080D89D0 @ =0x0000043d\n"
- "\tadds r0, r2\n"
- "\tldrb r1, [r0]\n"
- "\tmovs r0, 0x2\n"
- "\tands r0, r1\n"
- "\tcmp r0, 0\n"
- "\tbeq _080D89F2\n"
- "\tldrh r1, [r4, 0x38]\n"
- "\tadds r0, r1, 0\n"
- "\tsubs r0, 0x40\n"
- "\tlsls r0, 16\n"
- "\tlsrs r0, 16\n"
- "\tadds r3, r1, 0\n"
- "\tcmp r0, 0x7F\n"
- "\tbhi _080D89D4\n"
- "\tldrh r1, [r4, 0x3C]\n"
- "\tlsls r1, 16\n"
- "\tasrs r1, 24\n"
- "\tb _080D89DC\n"
- "\t.align 2, 0\n"
- "_080D89C8: .4byte gSineTable\n"
- "_080D89CC: .4byte gMain\n"
- "_080D89D0: .4byte 0x0000043d\n"
- "_080D89D4:\n"
- "\tldrh r1, [r4, 0x3C]\n"
- "\tlsls r1, 16\n"
- "\tasrs r1, 24\n"
- "\tadds r1, 0x1\n"
- "_080D89DC:\n"
- "\tmovs r0, 0x3\n"
- "\tands r1, r0\n"
- "\tlsls r1, 2\n"
- "\tldrb r2, [r4, 0x5]\n"
- "\tmovs r0, 0xD\n"
- "\tnegs r0, r0\n"
- "\tands r0, r2\n"
- "\torrs r0, r1\n"
- "\tstrb r0, [r4, 0x5]\n"
- "\tadds r0, r3, 0x4\n"
- "\tb _080D8A12\n"
- "_080D89F2:\n"
- "\tldrh r0, [r4, 0x38]\n"
- "\tsubs r0, 0x40\n"
- "\tlsls r0, 16\n"
- "\tlsrs r0, 16\n"
- "\tcmp r0, 0x7F\n"
- "\tbhi _080D8A06\n"
- "\tadds r1, r4, 0\n"
- "\tadds r1, 0x43\n"
- "\tmovs r0, 0x80\n"
- "\tb _080D8A0C\n"
- "_080D8A06:\n"
- "\tadds r1, r4, 0\n"
- "\tadds r1, 0x43\n"
- "\tmovs r0, 0x8C\n"
- "_080D8A0C:\n"
- "\tstrb r0, [r1]\n"
- "\tldrh r0, [r4, 0x38]\n"
- "\tsubs r0, 0x4\n"
- "_080D8A12:\n"
- "\tmovs r1, 0xFF\n"
- "\tands r0, r1\n"
- "\tstrh r0, [r4, 0x38]\n"
- "\tmovs r1, 0x2E\n"
- "\tldrsh r0, [r4, r1]\n"
- "\tcmp r0, 0\n"
- "\tbgt _080D8AD0\n"
- "\tmovs r2, 0\n"
- "\tmovs r0, 0xC0\n"
- "\tlsls r0, 2\n"
- "\tstrh r0, [r4, 0x2E]\n"
- "\tldrh r0, [r4, 0x24]\n"
- "\tldrh r1, [r4, 0x20]\n"
- "\tadds r0, r1\n"
- "\tstrh r0, [r4, 0x20]\n"
- "\tstrh r0, [r4, 0x30]\n"
- "\tldrh r0, [r4, 0x26]\n"
- "\tldrh r1, [r4, 0x22]\n"
- "\tadds r0, r1\n"
- "\tstrh r0, [r4, 0x22]\n"
- "\tstrh r0, [r4, 0x34]\n"
- "\tadds r0, 0x4\n"
- "\tstrh r0, [r4, 0x36]\n"
- "\tldr r0, _080D8A68 @ =gMain\n"
- "\tldr r1, _080D8A6C @ =0x0000043d\n"
- "\tadds r0, r1\n"
- "\tldrb r1, [r0]\n"
- "\tmovs r0, 0x2\n"
- "\tands r0, r1\n"
- "\tcmp r0, 0\n"
- "\tbeq _080D8A78\n"
- "\tldr r1, _080D8A70 @ =gBattlerPositions\n"
- "\tldr r0, _080D8A74 @ =gBattleAnimTarget\n"
- "\tldrb r0, [r0]\n"
- "\tadds r0, r1\n"
- "\tldrb r1, [r0]\n"
- "\tmovs r0, 0x1\n"
- "\tands r0, r1\n"
- "\tcmp r0, 0\n"
- "\tbeq _080D8A78\n"
- "\tmovs r0, 0x80\n"
- "\tlsls r0, 1\n"
- "\tb _080D8A7A\n"
- "\t.align 2, 0\n"
- "_080D8A68: .4byte gMain\n"
- "_080D8A6C: .4byte 0x0000043d\n"
- "_080D8A70: .4byte gBattlerPositions\n"
- "_080D8A74: .4byte gBattleAnimTarget\n"
- "_080D8A78:\n"
- "\tldr r0, _080D8A90 @ =0x0000fff0\n"
- "_080D8A7A:\n"
- "\tstrh r0, [r4, 0x32]\n"
- "\tldrh r0, [r4, 0x3C]\n"
- "\tadds r0, 0x1\n"
- "\tmovs r1, 0\n"
- "\tstrh r0, [r4, 0x3C]\n"
- "\tstrh r1, [r4, 0x26]\n"
- "\tstrh r1, [r4, 0x24]\n"
- "\tadds r0, r4, 0\n"
- "\tbl sub_8078BD4\n"
- "\tb _080D8AD0\n"
- "\t.align 2, 0\n"
- "_080D8A90: .4byte 0x0000fff0\n"
- "_080D8A94:\n"
- "\tadds r0, r4, 0\n"
- "\tbl TranslateAnimLinear\n"
- "\tlsls r0, 24\n"
- "\tcmp r0, 0\n"
- "\tbeq _080D8AD0\n"
- "\tldrb r0, [r4, 0x1]\n"
- "\tlsls r0, 30\n"
- "\tlsrs r0, 30\n"
- "\tmovs r1, 0x1\n"
- "\tands r0, r1\n"
- "\tcmp r0, 0\n"
- "\tbeq _080D8AC2\n"
- "\tldrb r0, [r4, 0x3]\n"
- "\tlsls r0, 26\n"
- "\tlsrs r0, 27\n"
- "\tbl FreeOamMatrix\n"
- "\tldrb r1, [r4, 0x1]\n"
- "\tmovs r0, 0x4\n"
- "\tnegs r0, r0\n"
- "\tands r0, r1\n"
- "\tstrb r0, [r4, 0x1]\n"
- "_080D8AC2:\n"
- "\tadds r0, r4, 0\n"
- "\tbl DestroySprite\n"
- "\tldr r1, _080D8AD8 @ =gAnimVisualTaskCount\n"
- "\tldrb r0, [r1]\n"
- "\tsubs r0, 0x1\n"
- "\tstrb r0, [r1]\n"
- "_080D8AD0:\n"
- "\tpop {r4-r6}\n"
- "\tpop {r0}\n"
- "\tbx r0\n"
- "\t.align 2, 0\n"
- "_080D8AD8: .4byte gAnimVisualTaskCount");
-}
-#endif // NONMATCHING
// Creates Hail.
void AnimTask_Hail1(u8 taskId)
@@ -1929,266 +1401,63 @@ static void AnimTask_Hail2(u8 taskId)
}
}
-
-/*
-// Something to do with Hail.
-// possibly equivalent, possibly not
-bool8 sub_80D8BA8(u8 a1, u8 a2, u8 a3, u8 a4)//(u8 spriteId, u8 taskId, u8 a3)//(u8 taskId)
+bool8 sub_80D8BA8(u8 hailStructId, u8 affineAnimNum, u8 taskId, u8 c)
{
- //
- //struct Task *task = &gTasks[a2];
- //u16 i, j;
- //task->data[3]++;
- //u8 r5bank = ;
-
- //const struct SpriteTemplate *spriteTemplate;
- u8 spriteId;
+ u8 id;
+ s16 battlerX, battlerY;
+ s16 spriteX;
+ bool8 possibleBool = FALSE;
+ s8 unk = gUnknown_083D9DC4[hailStructId].unk3;
- s16 r6, r7;
-
- u32 tempA, tempB; // u32? s16? u16? u8? int?
-
- //u8 r6, r7;
-
- tempA = a3 + 0;
- tempB = 0;
-
- // is that gunknown a tempvar?
-
- if (gUnknown_083D9DC4[a1][3] != 2
- || IsAnimBankSpriteVisible(GetBattlerAtPosition(gUnknown_083D9DC4[a1][2])))
+ if (unk != 2)
{
- //return TRUE;
- tempB = 1;
-
- r7 = GetBattlerSpriteCoord(GetBattlerAtPosition(gUnknown_083D9DC4[a1][2]), 2);
- r6 = GetBattlerSpriteCoord(GetBattlerAtPosition(gUnknown_083D9DC4[a1][2]), 3);
-
- switch (gUnknown_083D9DC4[a1][3])
+ id = GetBattlerAtPosition(gUnknown_083D9DC4[hailStructId].bPosition);
+ if (IsAnimBankSpriteVisible(id))
{
- case 0:
- //
- r7 -= GetBattlerSpriteCoordAttr(GetBattlerAtPosition(gUnknown_083D9DC4[a1][2]), 1) / 6;
- r6 -= GetBattlerSpriteCoordAttr(GetBattlerAtPosition(gUnknown_083D9DC4[a1][2]), 0) / 6;
- break;
- case 1:
- //
- r7 += GetBattlerSpriteCoordAttr(GetBattlerAtPosition(gUnknown_083D9DC4[a1][2]), 1) / 6;
- r6 += GetBattlerSpriteCoordAttr(GetBattlerAtPosition(gUnknown_083D9DC4[a1][2]), 0) / 6;
+ possibleBool = TRUE;
+ battlerX = GetBattlerSpriteCoord(id, BATTLER_COORD_X_2);
+ battlerY = GetBattlerSpriteCoord(id, BATTLER_COORD_Y_PIC_OFFSET);
+ switch (unk)
+ {
+ case 0:
+ battlerX -= GetBattlerSpriteCoordAttr(id, BATTLER_COORD_ATTR_WIDTH) / 6;
+ battlerY -= GetBattlerSpriteCoordAttr(id, BATTLER_COORD_ATTR_HEIGHT) / 6;
+ break;
+ case 1:
+ battlerX += GetBattlerSpriteCoordAttr(id, BATTLER_COORD_ATTR_WIDTH) / 6;
+ battlerY += GetBattlerSpriteCoordAttr(id, BATTLER_COORD_ATTR_HEIGHT) / 6;
+ break;
+ }
+ }
+ else
+ {
+ battlerX = (gUnknown_083D9DC4[hailStructId].x);
+ battlerY = (gUnknown_083D9DC4[hailStructId].y);
}
}
-
else
{
- // _94
- r7 = gUnknown_083D9DC4[a1][0];
- r6 = gUnknown_083D9DC4[a1][1];
+ battlerX = (gUnknown_083D9DC4[hailStructId].x);
+ battlerY = (gUnknown_083D9DC4[hailStructId].y);
}
-
- spriteId = CreateSprite(&HailSpriteTemplate, r7 - r6, -0x8, 0x12);
-
- if (spriteId != 0x40)
+ spriteX = battlerX - ((battlerY + 8) / 2);
+ id = CreateSprite(&gHailSpriteTemplate, spriteX, -8, 18);
+ if (id == MAX_SPRITES)
{
- //
- StartSpriteAffineAnim(&gSprites[spriteId], a2);
-
- gSprites[spriteId].data[0] = tempB;
- gSprites[spriteId].data[3] = r7;
- gSprites[spriteId].data[4] = r6;
-
- gSprites[spriteId].data[5] = a2;
- gSprites[spriteId].data[6] = tempA;
- gSprites[spriteId].data[7] = a4;
-
+ return FALSE;
+ }
+ else
+ {
+ StartSpriteAffineAnim(&gSprites[id], affineAnimNum);
+ gSprites[id].data[0] = possibleBool;
+ gSprites[id].data[3] = battlerX;
+ gSprites[id].data[4] = battlerY;
+ gSprites[id].data[5] = affineAnimNum;
+ gSprites[id].data[6] = taskId;
+ gSprites[id].data[7] = c;
return TRUE;
}
-
- return FALSE;
-
-}
-//*/
-
-//*
-NAKED bool8 sub_80D8BA8(u8 a1, u8 a2, u8 a3, u8 a4)
-{
- asm_unified("\tpush {r4-r7,lr}\n"
- "\tmov r7, r10\n"
- "\tmov r6, r9\n"
- "\tmov r5, r8\n"
- "\tpush {r5-r7}\n"
- "\tsub sp, 0x8\n"
- "\tlsls r0, 24\n"
- "\tlsls r1, 24\n"
- "\tlsrs r1, 24\n"
- "\tmov r9, r1\n"
- "\tlsls r2, 24\n"
- "\tlsrs r2, 24\n"
- "\tstr r2, [sp]\n"
- "\tlsls r3, 24\n"
- "\tlsrs r3, 24\n"
- "\tmov r10, r3\n"
- "\tmovs r1, 0\n"
- "\tstr r1, [sp, 0x4]\n"
- "\tldr r1, _080D8C20 @ =gUnknown_083D9DC4\n"
- "\tlsrs r0, 22\n"
- "\tadds r4, r0, r1\n"
- "\tldrb r0, [r4, 0x3]\n"
- "\tlsls r0, 24\n"
- "\tasrs r0, 28\n"
- "\tmov r8, r0\n"
- "\tcmp r0, 0x2\n"
- "\tbeq _080D8C94\n"
- "\tldrh r0, [r4, 0x2]\n"
- "\tlsls r0, 20\n"
- "\tlsrs r0, 24\n"
- "\tbl GetBattlerAtPosition\n"
- "\tlsls r0, 24\n"
- "\tlsrs r5, r0, 24\n"
- "\tadds r0, r5, 0\n"
- "\tbl IsAnimBankSpriteVisible\n"
- "\tlsls r0, 24\n"
- "\tcmp r0, 0\n"
- "\tbeq _080D8C94\n"
- "\tmovs r0, 0x1\n"
- "\tstr r0, [sp, 0x4]\n"
- "\tadds r0, r5, 0\n"
- "\tmovs r1, 0x2\n"
- "\tbl GetBattlerSpriteCoord\n"
- "\tlsls r0, 24\n"
- "\tlsrs r7, r0, 24\n"
- "\tadds r0, r5, 0\n"
- "\tmovs r1, 0x3\n"
- "\tbl GetBattlerSpriteCoord\n"
- "\tlsls r0, 24\n"
- "\tlsrs r6, r0, 24\n"
- "\tmov r1, r8\n"
- "\tcmp r1, 0\n"
- "\tbeq _080D8C24\n"
- "\tcmp r1, 0x1\n"
- "\tbeq _080D8C5A\n"
- "\tb _080D8CA6\n"
- "\t.align 2, 0\n"
- "_080D8C20: .4byte gUnknown_083D9DC4\n"
- "_080D8C24:\n"
- "\tadds r0, r5, 0\n"
- "\tmovs r1, 0x1\n"
- "\tbl GetBattlerSpriteCoordAttr\n"
- "\tlsls r0, 16\n"
- "\tasrs r0, 16\n"
- "\tmovs r1, 0x6\n"
- "\tbl __divsi3\n"
- "\tlsls r1, r7, 16\n"
- "\tasrs r1, 16\n"
- "\tsubs r1, r0\n"
- "\tlsls r1, 16\n"
- "\tlsrs r7, r1, 16\n"
- "\tadds r0, r5, 0\n"
- "\tmovs r1, 0\n"
- "\tbl GetBattlerSpriteCoordAttr\n"
- "\tlsls r0, 16\n"
- "\tasrs r0, 16\n"
- "\tmovs r1, 0x6\n"
- "\tbl __divsi3\n"
- "\tlsls r1, r6, 16\n"
- "\tasrs r1, 16\n"
- "\tsubs r1, r0\n"
- "\tb _080D8C8E\n"
- "_080D8C5A:\n"
- "\tadds r0, r5, 0\n"
- "\tmovs r1, 0x1\n"
- "\tbl GetBattlerSpriteCoordAttr\n"
- "\tlsls r0, 16\n"
- "\tasrs r0, 16\n"
- "\tmovs r1, 0x6\n"
- "\tbl __divsi3\n"
- "\tlsls r1, r7, 16\n"
- "\tasrs r1, 16\n"
- "\tadds r1, r0\n"
- "\tlsls r1, 16\n"
- "\tlsrs r7, r1, 16\n"
- "\tadds r0, r5, 0\n"
- "\tmovs r1, 0\n"
- "\tbl GetBattlerSpriteCoordAttr\n"
- "\tlsls r0, 16\n"
- "\tasrs r0, 16\n"
- "\tmovs r1, 0x6\n"
- "\tbl __divsi3\n"
- "\tlsls r1, r6, 16\n"
- "\tasrs r1, 16\n"
- "\tadds r1, r0\n"
- "_080D8C8E:\n"
- "\tlsls r1, 16\n"
- "\tlsrs r6, r1, 16\n"
- "\tb _080D8CA6\n"
- "_080D8C94:\n"
- "\tldrh r0, [r4]\n"
- "\tlsls r0, 22\n"
- "\tasrs r0, 6\n"
- "\tlsrs r7, r0, 16\n"
- "\tldr r0, [r4]\n"
- "\tlsls r0, 12\n"
- "\tasrs r0, 22\n"
- "\tlsls r0, 16\n"
- "\tlsrs r6, r0, 16\n"
- "_080D8CA6:\n"
- "\tlsls r0, r6, 16\n"
- "\tasrs r0, 16\n"
- "\tadds r0, 0x8\n"
- "\tlsrs r1, r0, 31\n"
- "\tadds r0, r1\n"
- "\tasrs r0, 1\n"
- "\tlsls r1, r7, 16\n"
- "\tasrs r1, 16\n"
- "\tsubs r1, r0\n"
- "\tldr r0, _080D8D00 @ =HailSpriteTemplate\n"
- "\tlsls r1, 16\n"
- "\tasrs r1, 16\n"
- "\tmovs r2, 0x8\n"
- "\tnegs r2, r2\n"
- "\tmovs r3, 0x12\n"
- "\tbl CreateSprite\n"
- "\tlsls r0, 24\n"
- "\tlsrs r5, r0, 24\n"
- "\tcmp r5, 0x40\n"
- "\tbeq _080D8D08\n"
- "\tlsls r4, r5, 4\n"
- "\tadds r4, r5\n"
- "\tlsls r4, 2\n"
- "\tldr r0, _080D8D04 @ =gSprites\n"
- "\tadds r4, r0\n"
- "\tadds r0, r4, 0\n"
- "\tmov r1, r9\n"
- "\tbl StartSpriteAffineAnim\n"
- "\tmov r0, sp\n"
- "\tldrh r0, [r0, 0x4]\n"
- "\tstrh r0, [r4, 0x2E]\n"
- "\tstrh r7, [r4, 0x34]\n"
- "\tstrh r6, [r4, 0x36]\n"
- "\tmov r1, r9\n"
- "\tstrh r1, [r4, 0x38]\n"
- "\tmov r0, sp\n"
- "\tldrh r0, [r0]\n"
- "\tstrh r0, [r4, 0x3A]\n"
- "\tmov r1, r10\n"
- "\tstrh r1, [r4, 0x3C]\n"
- "\tmovs r0, 0x1\n"
- "\tb _080D8D0A\n"
- "\t.align 2, 0\n"
- "_080D8D00: .4byte gHailSpriteTemplate\n"
- "_080D8D04: .4byte gSprites\n"
- "_080D8D08:\n"
- "\tmovs r0, 0\n"
- "_080D8D0A:\n"
- "\tadd sp, 0x8\n"
- "\tpop {r3-r5}\n"
- "\tmov r8, r3\n"
- "\tmov r9, r4\n"
- "\tmov r10, r5\n"
- "\tpop {r4-r7}\n"
- "\tpop {r1}\n"
- "\tbx r1");
}
-//*/
static void AnimHailBegin(struct Sprite *sprite)
{
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 08:45:24 +0000