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

Label unused move anims in anim_effects_2

Browse Source
This commit is contained in:
GriffinR
2021-04-13 03:17:39 -04:00
parent 33ea2a1061
commit f9f33b643e
1 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_anim_effects_2.c
+54 -54
View File
@@ -16,13 +16,13 @@
#include "constants/rgb.h" #include "constants/rgb.h"
#include "constants/songs.h" #include "constants/songs.h"
static void sub_8103448(struct Sprite *); static void AnimCirclingFinger(struct Sprite *);
static void sub_8103498(struct Sprite *); static void AnimBouncingMusicNote(struct Sprite *);
static void sub_81034D8(struct Sprite *); static void AnimBouncingMusicNote_Step(struct Sprite *);
static void sub_810358C(struct Sprite *); static void AnimVibrateBattlerBack(struct Sprite *);
static void sub_8103620(struct Sprite *); static void AnimMovingClamp(struct Sprite *);
static void sub_8103658(struct Sprite *); static void AnimMovingClamp_Step(struct Sprite *);
static void sub_8103680(struct Sprite *); static void AnimMovingClamp_End(struct Sprite *);
static void AnimKinesisZapEnergy(struct Sprite *); static void AnimKinesisZapEnergy(struct Sprite *);
static void AnimSwordsDanceBlade(struct Sprite *); static void AnimSwordsDanceBlade(struct Sprite *);
static void AnimSwordsDanceBlade_Step(struct Sprite *); static void AnimSwordsDanceBlade_Step(struct Sprite *);
@@ -30,8 +30,8 @@ static void AnimSonicBoomProjectile(struct Sprite *);
static void AnimAirWaveProjectile(struct Sprite *); static void AnimAirWaveProjectile(struct Sprite *);
static void AnimAirWaveProjectile_Step1(struct Sprite *sprite); static void AnimAirWaveProjectile_Step1(struct Sprite *sprite);
static void AnimAirWaveProjectile_Step2(struct Sprite *sprite); static void AnimAirWaveProjectile_Step2(struct Sprite *sprite);
static void sub_8103FE8(struct Sprite *); static void AnimVoidLines(struct Sprite *);
static void sub_8104018(struct Sprite *); static void AnimVoidLines_Step(struct Sprite *);
static void AnimCoinThrow(struct Sprite *); static void AnimCoinThrow(struct Sprite *);
static void AnimFallingCoin(struct Sprite *); static void AnimFallingCoin(struct Sprite *);
static void AnimFallingCoin_Step(struct Sprite *); static void AnimFallingCoin_Step(struct Sprite *);
@@ -109,7 +109,7 @@ static void AnimTask_ScaryFace_Step(u8);
static void AnimTask_UproarDistortion_Step(u8); static void AnimTask_UproarDistortion_Step(u8);
// Unused // Unused
const struct SpriteTemplate gUnknown_08593264 = static const struct SpriteTemplate sCirclingFingerSpriteTemplate =
{ {
.tileTag = ANIM_TAG_FINGER, .tileTag = ANIM_TAG_FINGER,
.paletteTag = ANIM_TAG_FINGER, .paletteTag = ANIM_TAG_FINGER,
@@ -117,23 +117,23 @@ const struct SpriteTemplate gUnknown_08593264 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_8103448, .callback = AnimCirclingFinger,
}; };
const union AnimCmd gUnknown_0859327C[] = static const union AnimCmd sAnim_BouncingMusicNote[] =
{ {
ANIMCMD_FRAME(4, 1), ANIMCMD_FRAME(4, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
// Unused // Unused (association assumed)
const union AnimCmd *const gUnknown_08593284[] = static const union AnimCmd *const sAnims_BouncingMusicNote[] =
{ {
gUnknown_0859327C, sAnim_BouncingMusicNote,
}; };
// Unused // Unused
const struct SpriteTemplate gUnknown_08593288 = static const struct SpriteTemplate sBouncingMusicNoteSpriteTemplate =
{ {
.tileTag = ANIM_TAG_MUSIC_NOTES, .tileTag = ANIM_TAG_MUSIC_NOTES,
.paletteTag = ANIM_TAG_MUSIC_NOTES, .paletteTag = ANIM_TAG_MUSIC_NOTES,
@@ -141,11 +141,11 @@ const struct SpriteTemplate gUnknown_08593288 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_8103498, .callback = AnimBouncingMusicNote,
}; };
// Unused // Unused
const struct SpriteTemplate gUnknown_085932A0 = static const struct SpriteTemplate sVibrateBattlerBackSpriteTemplate =
{ {
.tileTag = 0, .tileTag = 0,
.paletteTag = 0, .paletteTag = 0,
@@ -153,11 +153,11 @@ const struct SpriteTemplate gUnknown_085932A0 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_810358C, .callback = AnimVibrateBattlerBack,
}; };
// Unused // Unused
const struct SpriteTemplate gUnknown_085932B8 = static const struct SpriteTemplate sMovingClampSpriteTemplate =
{ {
.tileTag = ANIM_TAG_CLAMP, .tileTag = ANIM_TAG_CLAMP,
.paletteTag = ANIM_TAG_CLAMP, .paletteTag = ANIM_TAG_CLAMP,
@@ -165,10 +165,10 @@ const struct SpriteTemplate gUnknown_085932B8 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gAffineAnims_Bite, .affineAnims = gAffineAnims_Bite,
.callback = sub_8103620, .callback = AnimMovingClamp,
}; };
const union AnimCmd gUnknown_085932D0[] = static const union AnimCmd sAnim_SmallExplosion[] =
{ {
ANIMCMD_FRAME(0, 9), ANIMCMD_FRAME(0, 9),
ANIMCMD_FRAME(16, 3), ANIMCMD_FRAME(16, 3),
@@ -177,32 +177,32 @@ const union AnimCmd gUnknown_085932D0[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gUnknown_085932E4[] = static const union AnimCmd *const sAnims_SmallExplosion[] =
{ {
gUnknown_085932D0, sAnim_SmallExplosion,
}; };
const union AffineAnimCmd gUnknown_085932E8[] = static const union AffineAnimCmd sAffineAnim_SmallExplosion[] =
{ {
AFFINEANIMCMD_FRAME(0x50, 0x50, 0, 0), AFFINEANIMCMD_FRAME(0x50, 0x50, 0, 0),
AFFINEANIMCMD_FRAME(0x9, 0x9, 0, 18), AFFINEANIMCMD_FRAME(0x9, 0x9, 0, 18),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd *const gUnknown_08593300[] = static const union AffineAnimCmd *const sAffineAnims_SmallExplosion[] =
{ {
gUnknown_085932E8, sAffineAnim_SmallExplosion,
}; };
// Unused // Unused
const struct SpriteTemplate gUnknown_08593304 = static const struct SpriteTemplate sSmallExplosionSpriteTemplate =
{ {
.tileTag = ANIM_TAG_EXPLOSION_6, .tileTag = ANIM_TAG_EXPLOSION_6,
.paletteTag = ANIM_TAG_EXPLOSION_6, .paletteTag = ANIM_TAG_EXPLOSION_6,
.oam = &gOamData_AffineNormal_ObjNormal_32x32, .oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = gUnknown_085932E4, .anims = sAnims_SmallExplosion,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_08593300, .affineAnims = sAffineAnims_SmallExplosion,
.callback = AnimSpriteOnMonPos, .callback = AnimSpriteOnMonPos,
}; };
@@ -366,7 +366,7 @@ const struct SpriteTemplate gEggThrowSpriteTemplate =
}; };
// Unused // Unused
const struct SpriteTemplate gUnknown_085934A0 = static const struct SpriteTemplate sVoidLinesSpriteTemplate =
{ {
.tileTag = ANIM_TAG_VOID_LINES, .tileTag = ANIM_TAG_VOID_LINES,
.paletteTag = ANIM_TAG_VOID_LINES, .paletteTag = ANIM_TAG_VOID_LINES,
@@ -374,7 +374,7 @@ const struct SpriteTemplate gUnknown_085934A0 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_8103FE8, .callback = AnimVoidLines,
}; };
const union AnimCmd gCoinAnimCmds[] = const union AnimCmd gCoinAnimCmds[] =
@@ -1096,7 +1096,7 @@ const struct SpriteTemplate gDevilSpriteTemplate =
.callback = AnimDevil, .callback = AnimDevil,
}; };
const union AnimCmd gUnknown_08593B08[] = static const union AnimCmd sAnim_FurySwipes[] =
{ {
ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(0, 4),
ANIMCMD_FRAME(16, 4), ANIMCMD_FRAME(16, 4),
@@ -1105,7 +1105,7 @@ const union AnimCmd gUnknown_08593B08[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gUnknown_08593B1C[] = static const union AnimCmd sAnim_FurySwipes_Flipped[] =
{ {
ANIMCMD_FRAME(0, 4, .hFlip = TRUE), ANIMCMD_FRAME(0, 4, .hFlip = TRUE),
ANIMCMD_FRAME(16, 4, .hFlip = TRUE), ANIMCMD_FRAME(16, 4, .hFlip = TRUE),
@@ -1114,10 +1114,10 @@ const union AnimCmd gUnknown_08593B1C[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gFurySwipesAnimTable[] = static const union AnimCmd *const sAnims_FurySwipes[] =
{ {
gUnknown_08593B08, sAnim_FurySwipes,
gUnknown_08593B1C, sAnim_FurySwipes_Flipped,
}; };
const struct SpriteTemplate gFurySwipesSpriteTemplate = const struct SpriteTemplate gFurySwipesSpriteTemplate =
@@ -1125,7 +1125,7 @@ const struct SpriteTemplate gFurySwipesSpriteTemplate =
.tileTag = ANIM_TAG_SWIPE, .tileTag = ANIM_TAG_SWIPE,
.paletteTag = ANIM_TAG_SWIPE, .paletteTag = ANIM_TAG_SWIPE,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gFurySwipesAnimTable, .anims = sAnims_FurySwipes,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimFurySwipes, .callback = AnimFurySwipes,
@@ -1262,7 +1262,7 @@ const struct SpriteTemplate gGuardRingSpriteTemplate =
.callback = AnimGuardRing, .callback = AnimGuardRing,
}; };
static void sub_8103448(struct Sprite *sprite) static void AnimCirclingFinger(struct Sprite *sprite)
{ {
SetSpriteCoordsToAnimAttackerCoords(sprite); SetSpriteCoordsToAnimAttackerCoords(sprite);
SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]); SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]);
@@ -1276,7 +1276,7 @@ static void sub_8103448(struct Sprite *sprite)
sprite->callback(sprite); sprite->callback(sprite);
} }
static void sub_8103498(struct Sprite *sprite) static void AnimBouncingMusicNote(struct Sprite *sprite)
{ {
u8 battler; u8 battler;
if (gBattleAnimArgs[0] == 0) if (gBattleAnimArgs[0] == 0)
@@ -1287,10 +1287,10 @@ static void sub_8103498(struct Sprite *sprite)
SetSpriteNextToMonHead(battler, sprite); SetSpriteNextToMonHead(battler, sprite);
sprite->data[0] = 0; sprite->data[0] = 0;
sprite->data[1] = 0; sprite->data[1] = 0;
sprite->callback = sub_81034D8; sprite->callback = AnimBouncingMusicNote_Step;
} }
static void sub_81034D8(struct Sprite *sprite) static void AnimBouncingMusicNote_Step(struct Sprite *sprite)
{ {
switch (sprite->data[0]) switch (sprite->data[0])
{ {
@@ -1311,7 +1311,7 @@ static void sub_81034D8(struct Sprite *sprite)
} }
} }
static void sub_810353C(struct Sprite *sprite) static void AnimVibrateBattlerBack_Step(struct Sprite *sprite)
{ {
s16 temp; s16 temp;
gSprites[sprite->data[2]].pos2.x += sprite->data[1]; gSprites[sprite->data[2]].pos2.x += sprite->data[1];
@@ -1326,7 +1326,7 @@ static void sub_810353C(struct Sprite *sprite)
sprite->data[0]--; sprite->data[0]--;
} }
static void sub_810358C(struct Sprite *sprite) static void AnimVibrateBattlerBack(struct Sprite *sprite)
{ {
u8 spriteId; u8 spriteId;
sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
@@ -1341,30 +1341,30 @@ static void sub_810358C(struct Sprite *sprite)
sprite->data[0] = gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[2];
sprite->data[1] = gBattleAnimArgs[3]; sprite->data[1] = gBattleAnimArgs[3];
sprite->data[2] = spriteId; sprite->data[2] = spriteId;
sprite->callback = sub_810353C; sprite->callback = AnimVibrateBattlerBack_Step;
sprite->invisible = TRUE; sprite->invisible = TRUE;
} }
static void sub_8103620(struct Sprite *sprite) static void AnimMovingClamp(struct Sprite *sprite)
{ {
InitSpritePosToAnimAttacker(sprite, TRUE); InitSpritePosToAnimAttacker(sprite, TRUE);
sprite->data[0] = gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[2];
sprite->data[1] = gBattleAnimArgs[3]; sprite->data[1] = gBattleAnimArgs[3];
sprite->data[5] = gBattleAnimArgs[4]; sprite->data[5] = gBattleAnimArgs[4];
sprite->callback = WaitAnimForDuration; sprite->callback = WaitAnimForDuration;
StoreSpriteCallbackInData6(sprite, sub_8103658); StoreSpriteCallbackInData6(sprite, AnimMovingClamp_Step);
} }
static void sub_8103658(struct Sprite *sprite) static void AnimMovingClamp_Step(struct Sprite *sprite)
{ {
sprite->data[0] = sprite->data[1]; sprite->data[0] = sprite->data[1];
sprite->data[2] = sprite->pos1.x; sprite->data[2] = sprite->pos1.x;
sprite->data[4] = sprite->pos1.y + 15; sprite->data[4] = sprite->pos1.y + 15;
sprite->callback = StartAnimLinearTranslation; sprite->callback = StartAnimLinearTranslation;
StoreSpriteCallbackInData6(sprite, sub_8103680); StoreSpriteCallbackInData6(sprite, AnimMovingClamp_End);
} }
static void sub_8103680(struct Sprite *sprite) static void AnimMovingClamp_End(struct Sprite *sprite)
{ {
if (sprite->data[5] == 0) if (sprite->data[5] == 0)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
@@ -1738,14 +1738,14 @@ void AnimTask_AirCutterProjectile(u8 taskId)
gTasks[taskId].func = AirCutterProjectileStep1; gTasks[taskId].func = AirCutterProjectileStep1;
} }
static void sub_8103FE8(struct Sprite *sprite) static void AnimVoidLines(struct Sprite *sprite)
{ {
InitSpritePosToAnimAttacker(sprite, FALSE); InitSpritePosToAnimAttacker(sprite, FALSE);
sprite->data[0] = 0x100 + (IndexOfSpritePaletteTag(gUnknown_085934A0.paletteTag) << 4); sprite->data[0] = 0x100 + (IndexOfSpritePaletteTag(sVoidLinesSpriteTemplate.paletteTag) << 4);
sprite->callback = sub_8104018; sprite->callback = AnimVoidLines_Step;
} }
static void sub_8104018(struct Sprite *sprite) static void AnimVoidLines_Step(struct Sprite *sprite)
{ {
u16 id, val; u16 id, val;
int i; int i;