ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-22 12:23:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Label misc unused move anims

Browse Source
This commit is contained in:
GriffinR 2021-04-13 04:04:09 -04:00
parent 7645be27eb
commit 98ab546d3a
5 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/battle_anim_flying.c
View File

@ -290,7 +290,7 @@ const struct SpriteTemplate gDiveBallSpriteTemplate =
.callback = AnimDiveBall, .callback = AnimDiveBall,
}; };
static const union AffineAnimCmd sAnim_Unused_085964A8[] = static const union AffineAnimCmd sAnim_Unused[] =
{ {
AFFINEANIMCMD_FRAME(0x100, 0x0, 0, 0), AFFINEANIMCMD_FRAME(0x100, 0x0, 0, 0),
AFFINEANIMCMD_FRAME(0x0, 0x20, 0, 12), AFFINEANIMCMD_FRAME(0x0, 0x20, 0, 12),
@ -299,9 +299,9 @@ static const union AffineAnimCmd sAnim_Unused_085964A8[] =
}; };
// Unused // Unused
static const union AffineAnimCmd *const sAnims_Unused_085964C8[] = static const union AffineAnimCmd *const sAnims_Unused[] =
{ {
sAnim_Unused_085964A8, sAnim_Unused,
}; };
const struct SpriteTemplate gDiveWaterSplashSpriteTemplate = const struct SpriteTemplate gDiveWaterSplashSpriteTemplate =

20
src/battle_anim_ghost.c
View File

@ -39,8 +39,8 @@ static void AnimGhostStatusSprite(struct Sprite *);
static void AnimGhostStatusSprite_Step(struct Sprite *); static void AnimGhostStatusSprite_Step(struct Sprite *);
static void AnimTask_GrudgeFlames_Step(u8 taskId); static void AnimTask_GrudgeFlames_Step(u8 taskId);
static void AnimGrudgeFlame(struct Sprite *); static void AnimGrudgeFlame(struct Sprite *);
static void AnimUnused_8112F60(struct Sprite *); static void AnimMonMoveCircular(struct Sprite *);
static void AnimUnused_8112F60_Step(struct Sprite *); static void AnimMonMoveCircular_Step(struct Sprite *);
static const union AffineAnimCmd sAffineAnim_ConfuseRayBallBounce[] = static const union AffineAnimCmd sAffineAnim_ConfuseRayBallBounce[] =
{ {
@ -124,16 +124,16 @@ const struct SpriteTemplate gLickSpriteTemplate =
.callback = AnimLick, .callback = AnimLick,
}; };
static const union AffineAnimCmd sAnim_Unused_08596DA4[] = static const union AffineAnimCmd sAffineAnim_Unused[] =
{ {
AFFINEANIMCMD_FRAME(0x200, 0x200, 0, 0), AFFINEANIMCMD_FRAME(0x200, 0x200, 0, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
// Unused // Unused
static const union AffineAnimCmd *const gAnims_Unused_08596DB4[] = static const union AffineAnimCmd *const sAffineAnims_Unused[] =
{ {
sAnim_Unused_08596DA4, sAffineAnim_Unused,
}; };
const struct SpriteTemplate gDestinyBondWhiteShadowSpriteTemplate = const struct SpriteTemplate gDestinyBondWhiteShadowSpriteTemplate =
@ -206,7 +206,7 @@ const struct SpriteTemplate gGrudgeFlameSpriteTemplate =
}; };
// Unused // Unused
const struct SpriteTemplate gUnusedSpriteTemplate_08596E48 = static const struct SpriteTemplate sMonMoveCircularSpriteTemplate =
{ {
.tileTag = 0, .tileTag = 0,
.paletteTag = 0, .paletteTag = 0,
@ -214,7 +214,7 @@ const struct SpriteTemplate gUnusedSpriteTemplate_08596E48 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimUnused_8112F60, .callback = AnimMonMoveCircular,
}; };
static void AnimConfuseRayBallBounce(struct Sprite *sprite) static void AnimConfuseRayBallBounce(struct Sprite *sprite)
@ -1302,7 +1302,7 @@ static void AnimGrudgeFlame(struct Sprite *sprite)
} }
} }
static void AnimUnused_8112F60(struct Sprite *sprite) static void AnimMonMoveCircular(struct Sprite *sprite)
{ {
sprite->invisible = TRUE; sprite->invisible = TRUE;
sprite->data[5] = gBattlerSpriteIds[gBattleAnimAttacker]; sprite->data[5] = gBattlerSpriteIds[gBattleAnimAttacker];
@ -1310,12 +1310,12 @@ static void AnimUnused_8112F60(struct Sprite *sprite)
sprite->data[1] = 10; sprite->data[1] = 10;
sprite->data[2] = gBattleAnimArgs[0]; sprite->data[2] = gBattleAnimArgs[0];
sprite->data[3] = gBattleAnimArgs[1]; sprite->data[3] = gBattleAnimArgs[1];
sprite->callback = AnimUnused_8112F60_Step; sprite->callback = AnimMonMoveCircular_Step;
gSprites[sprite->data[5]].pos1.y += 8; gSprites[sprite->data[5]].pos1.y += 8;
} }
static void AnimUnused_8112F60_Step(struct Sprite *sprite) static void AnimMonMoveCircular_Step(struct Sprite *sprite)
{ {
if (sprite->data[3]) if (sprite->data[3])
{ {

6
src/battle_anim_ice.c
View File

@ -49,16 +49,16 @@ static void AnimTask_LoadMistTiles_Step(u8);
static void AnimTask_Hail2(u8); static void AnimTask_Hail2(u8);
static bool8 GenerateHailParticle(u8 hailStructId, u8 affineAnimNum, u8 taskId, u8 c); static bool8 GenerateHailParticle(u8 hailStructId, u8 affineAnimNum, u8 taskId, u8 c);
static const union AnimCmd sAnim_Unused_08595A48[] = static const union AnimCmd sAnim_Unused[] =
{ {
ANIMCMD_FRAME(0, 5, .hFlip = TRUE), ANIMCMD_FRAME(0, 5, .hFlip = TRUE),
ANIMCMD_FRAME(1, 5, .hFlip = TRUE), ANIMCMD_FRAME(1, 5, .hFlip = TRUE),
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
static const union AnimCmd *const sAnims_Unused_08595A54[] = static const union AnimCmd *const sAnims_Unused[] =
{ {
sAnim_Unused_08595A48, sAnim_Unused,
}; };
// Unused // Unused

16
src/battle_anim_normal.c
View File

@ -12,7 +12,7 @@ static void AnimSimplePaletteBlend_Step(struct Sprite *);
static void AnimComplexPaletteBlend(struct Sprite *); static void AnimComplexPaletteBlend(struct Sprite *);
static void AnimComplexPaletteBlend_Step1(struct Sprite *); static void AnimComplexPaletteBlend_Step1(struct Sprite *);
static void AnimComplexPaletteBlend_Step2(struct Sprite *); static void AnimComplexPaletteBlend_Step2(struct Sprite *);
static void AnimUnused_81159B4(struct Sprite *); static void AnimCirclingSparkle(struct Sprite *);
static void AnimShakeMonOrBattleTerrain(struct Sprite *); static void AnimShakeMonOrBattleTerrain(struct Sprite *);
static void AnimShakeMonOrBattleTerrain_Step(struct Sprite *); static void AnimShakeMonOrBattleTerrain_Step(struct Sprite *);
static void AnimShakeMonOrBattleTerrain_UpdateCoordOffsetEnabled(void); static void AnimShakeMonOrBattleTerrain_UpdateCoordOffsetEnabled(void);
@ -92,7 +92,7 @@ const struct SpriteTemplate gComplexPaletteBlendSpriteTemplate =
.callback = AnimComplexPaletteBlend, .callback = AnimComplexPaletteBlend,
}; };
static const union AnimCmd sAnim_Unused_085972A4[] = static const union AnimCmd sAnim_CirclingSparkle[] =
{ {
ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(0, 3),
ANIMCMD_FRAME(16, 3), ANIMCMD_FRAME(16, 3),
@ -102,21 +102,21 @@ static const union AnimCmd sAnim_Unused_085972A4[] =
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
static const union AnimCmd *const sAnims_Unused_085972BC[] = static const union AnimCmd *const sAnims_CirclingSparkle[] =
{ {
sAnim_Unused_085972A4, sAnim_CirclingSparkle,
}; };
// Unused // Unused
const struct SpriteTemplate gUnusedSpriteTemplate_085972C0 = static const struct SpriteTemplate sCirclingSparkleSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SPARKLE_4, .tileTag = ANIM_TAG_SPARKLE_4,
.paletteTag = ANIM_TAG_SPARKLE_4, .paletteTag = ANIM_TAG_SPARKLE_4,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = sAnims_Unused_085972BC, .anims = sAnims_CirclingSparkle,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimUnused_81159B4, .callback = AnimCirclingSparkle,
}; };
const struct SpriteTemplate gShakeMonOrTerrainSpriteTemplate = const struct SpriteTemplate gShakeMonOrTerrainSpriteTemplate =
@ -398,7 +398,7 @@ static void AnimComplexPaletteBlend_Step2(struct Sprite *sprite)
} }
} }
static void AnimUnused_81159B4(struct Sprite *sprite) static void AnimCirclingSparkle(struct Sprite *sprite)
{ {
sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.x += gBattleAnimArgs[0];
sprite->pos1.y += gBattleAnimArgs[1]; sprite->pos1.y += gBattleAnimArgs[1];

50
src/battle_anim_status_effects.c
View File

@ -17,14 +17,14 @@ extern const u8 *const gBattleAnims_StatusConditions[];
extern const struct OamData gOamData_AffineOff_ObjNormal_8x8; extern const struct OamData gOamData_AffineOff_ObjNormal_8x8;
extern const struct OamData gOamData_AffineOff_ObjBlend_64x64; extern const struct OamData gOamData_AffineOff_ObjBlend_64x64;
static void UnusedTask_80A9DB4(u8 taskId); static void Task_UpdateFlashingCircleImpacts(u8 taskId);
static void AnimTask_FrozenIceCube_Step1(u8 taskId); static void AnimTask_FrozenIceCube_Step1(u8 taskId);
static void AnimTask_FrozenIceCube_Step2(u8 taskId); static void AnimTask_FrozenIceCube_Step2(u8 taskId);
static void AnimTask_FrozenIceCube_Step3(u8 taskId); static void AnimTask_FrozenIceCube_Step3(u8 taskId);
static void AnimTask_FrozenIceCube_Step4(u8 taskId); static void AnimTask_FrozenIceCube_Step4(u8 taskId);
static void Task_DoStatusAnimation(u8 taskId); static void Task_DoStatusAnimation(u8 taskId);
static void AnimUnused_80A9E44(struct Sprite *sprite); static void AnimFlashingCircleImpact(struct Sprite *sprite);
static void AnimUnused_80A9E44_Step(struct Sprite *sprite); static void AnimFlashingCircleImpact_Step(struct Sprite *sprite);
static const union AnimCmd sAnim_Unused_853EDE4[] = static const union AnimCmd sAnim_Unused_853EDE4[] =
{ {
@ -259,7 +259,7 @@ static const struct SpriteTemplate gFrozenIceCubeSpriteTemplate =
.callback = SpriteCallbackDummy, .callback = SpriteCallbackDummy,
}; };
static const struct SpriteTemplate gUnusedSpriteTemplate_0853EF60 = static const struct SpriteTemplate sFlashingCircleImpactSpriteTemplate =
{ {
.tileTag = ANIM_TAG_CIRCLE_IMPACT, .tileTag = ANIM_TAG_CIRCLE_IMPACT,
.paletteTag = ANIM_TAG_CIRCLE_IMPACT, .paletteTag = ANIM_TAG_CIRCLE_IMPACT,
@ -267,31 +267,31 @@ static const struct SpriteTemplate gUnusedSpriteTemplate_0853EF60 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimUnused_80A9E44, .callback = AnimFlashingCircleImpact,
}; };
// Unused // Unused
u8 Unused_80A9C70(u8 battlerId, bool8 b) static u8 Task_FlashingCircleImpacts(u8 battlerId, bool8 red)
{ {
u8 battlerSpriteId = gBattlerSpriteIds[battlerId]; u8 battlerSpriteId = gBattlerSpriteIds[battlerId];
u8 taskId = CreateTask(UnusedTask_80A9DB4, 10); u8 taskId = CreateTask(Task_UpdateFlashingCircleImpacts, 10);
u8 spriteId2; u8 spriteId;
u8 i; u8 i;
LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_CIRCLE_IMPACT)]); LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_CIRCLE_IMPACT)]);
LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_CIRCLE_IMPACT)]); LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_CIRCLE_IMPACT)]);
gTasks[taskId].data[0] = battlerId; gTasks[taskId].data[0] = battlerId;
if (b) if (red)
{ {
gTasks[taskId].data[1] = RGB_RED; gTasks[taskId].data[1] = RGB_RED;
for (i = 0; i < 10; i++) for (i = 0; i < 10; i++)
{ {
spriteId2 = CreateSprite(&gUnusedSpriteTemplate_0853EF60, gSprites[battlerSpriteId].pos1.x, gSprites[battlerSpriteId].pos1.y + 32, 0); spriteId = CreateSprite(&sFlashingCircleImpactSpriteTemplate, gSprites[battlerSpriteId].pos1.x, gSprites[battlerSpriteId].pos1.y + 32, 0);
gSprites[spriteId2].data[0] = i * 51; gSprites[spriteId].data[0] = i * 51;
gSprites[spriteId2].data[1] = -256; gSprites[spriteId].data[1] = -256;
gSprites[spriteId2].invisible = TRUE; gSprites[spriteId].invisible = TRUE;
if (i > 4) if (i > 4)
gSprites[spriteId2].data[6] = 21; gSprites[spriteId].data[6] = 21;
} }
} }
else else
@ -299,19 +299,19 @@ u8 Unused_80A9C70(u8 battlerId, bool8 b)
gTasks[taskId].data[1] = RGB_BLUE; gTasks[taskId].data[1] = RGB_BLUE;
for (i = 0; i < 10; i++) for (i = 0; i < 10; i++)
{ {
spriteId2 = CreateSprite(&gUnusedSpriteTemplate_0853EF60, gSprites[battlerSpriteId].pos1.x, gSprites[battlerSpriteId].pos1.y - 32, 0); spriteId = CreateSprite(&sFlashingCircleImpactSpriteTemplate, gSprites[battlerSpriteId].pos1.x, gSprites[battlerSpriteId].pos1.y - 32, 0);
gSprites[spriteId2].data[0] = i * 51; gSprites[spriteId].data[0] = i * 51;
gSprites[spriteId2].data[1] = 256; gSprites[spriteId].data[1] = 256;
gSprites[spriteId2].invisible = TRUE; gSprites[spriteId].invisible = TRUE;
if (i > 4) if (i > 4)
gSprites[spriteId2].data[6] = 21; gSprites[spriteId].data[6] = 21;
} }
} }
gSprites[spriteId2].data[7] = 1; gSprites[spriteId].data[7] = 1;
return taskId; return taskId;
} }
static void UnusedTask_80A9DB4(u8 taskId) static void Task_UpdateFlashingCircleImpacts(u8 taskId)
{ {
if (gTasks[taskId].data[2] == 2) if (gTasks[taskId].data[2] == 2)
{ {
@ -344,13 +344,13 @@ static void UnusedTask_80A9DB4(u8 taskId)
} }
} }
static void AnimUnused_80A9E44(struct Sprite *sprite) static void AnimFlashingCircleImpact(struct Sprite *sprite)
{ {
if (sprite->data[6] == 0) if (sprite->data[6] == 0)
{ {
sprite->invisible = FALSE; sprite->invisible = FALSE;
sprite->callback = AnimUnused_80A9E44_Step; sprite->callback = AnimFlashingCircleImpact_Step;
AnimUnused_80A9E44_Step(sprite); AnimFlashingCircleImpact_Step(sprite);
} }
else else
{ {
@ -358,7 +358,7 @@ static void AnimUnused_80A9E44(struct Sprite *sprite)
} }
} }
static void AnimUnused_80A9E44_Step(struct Sprite *sprite) static void AnimFlashingCircleImpact_Step(struct Sprite *sprite)
{ {
sprite->pos2.x = Cos(sprite->data[0], 32); sprite->pos2.x = Cos(sprite->data[0], 32);
sprite->pos2.y = Sin(sprite->data[0], 8); sprite->pos2.y = Sin(sprite->data[0], 8);