dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Label unused move anims

Browse Source
This commit is contained in:
GriffinR
2021-04-11 13:21:22 -04:00
parent 09a9efd5c5
commit 2166e337a1
6 changed files with 89 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_anim_ice.c
+13 -13
View File
@@ -20,8 +20,8 @@ struct HailStruct {
s32 unk3:4;
};
static void AnimUnused_810B6C4(struct Sprite *);
static void AnimUnused_810B6C4_Step(struct Sprite *);
static void AnimUnusedIceCrystalThrow(struct Sprite *);
static void AnimUnusedIceCrystalThrow_Step(struct Sprite *);
static void AnimIcePunchSwirlingParticle(struct Sprite *);
static void AnimIceBeamParticle(struct Sprite *);
static void AnimIceEffectParticle(struct Sprite *);
@@ -62,7 +62,7 @@ static const union AnimCmd *const sAnims_Unused_08595A54[] =
};
// Unused
const struct SpriteTemplate gUnusedSpriteTemplate_08595A58 =
static const struct SpriteTemplate sUnusedIceCrystalThrowSpriteTemplate =
{
.tileTag = ANIM_TAG_ICE_CRYSTALS,
.paletteTag = ANIM_TAG_ICE_CRYSTALS,
@@ -70,10 +70,10 @@ const struct SpriteTemplate gUnusedSpriteTemplate_08595A58 =
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimUnused_810B6C4,
.callback = AnimUnusedIceCrystalThrow,
};
static const union AnimCmd sAnim_Unused_08595A70[] =
static const union AnimCmd sAnim_IceCrystalLargeChunk[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
@@ -110,10 +110,10 @@ static const union AnimCmd sAnim_SmallBubblePair[] =
ANIMCMD_JUMP(0),
};
// Unused
static const union AnimCmd *const sAnims_Unused_08595AA4[] =
// Unused, contains just the top left corner of the large ice crystal
static const union AnimCmd *const sAnims_IceCrystalLargeChunk[] =
{
sAnim_Unused_08595A70,
sAnim_IceCrystalLargeChunk,
};
static const union AnimCmd *const sAnims_IceCrystalLarge[] =
@@ -524,7 +524,7 @@ const struct SpriteTemplate gIceBallImpactShardSpriteTemplate =
};
// Unused
static void AnimUnused_810B6C4(struct Sprite *sprite)
static void AnimUnusedIceCrystalThrow(struct Sprite *sprite)
{
s16 targetX, targetY, attackerX, attackerY;
@@ -540,13 +540,13 @@ static void AnimUnused_810B6C4(struct Sprite *sprite)
sprite->data[4] = gBattleAnimArgs[3] + targetY;
sub_80A64EC(sprite);
for (;(targetX >= -32 && targetX <= 272) && (targetY >= -32 && targetY <= 192);
for (;(targetX >= -32 && targetX <= DISPLAY_WIDTH + 32) && (targetY >= -32 && targetY <= DISPLAY_HEIGHT + 32);
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);
for (;(attackerX >= -32 && attackerX <= DISPLAY_WIDTH + 32) && (attackerY >= -32 && attackerY <= DISPLAY_HEIGHT + 32);
attackerX += sprite->data[1], attackerY += sprite->data[2])
;
@@ -560,10 +560,10 @@ static void AnimUnused_810B6C4(struct Sprite *sprite)
sub_80A64EC(sprite);
sprite->data[3] = gBattleAnimArgs[5];
sprite->data[4] = gBattleAnimArgs[6];
sprite->callback = AnimUnused_810B6C4_Step;
sprite->callback = AnimUnusedIceCrystalThrow_Step;
}
static void AnimUnused_810B6C4_Step(struct Sprite *sprite)
static void AnimUnusedIceCrystalThrow_Step(struct Sprite *sprite)
{
if (sprite->data[0] != 0)
{