dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

battle anim documentation

Browse Source
This commit is contained in:
Evan
2020-04-23 22:40:13 -06:00
parent 1c7c4c021d
commit 87ba2b8bde
25 changed files with 3498 additions and 3524 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/battle_anim_scripts.s
+2289 -2319
View File
File diff suppressed because it is too large Load Diff
include/battle_anim.h
+66 -66
View File
@@ -215,7 +215,7 @@ void AnimMetronomeFinger(struct Sprite *);
void AnimFollowMeFinger(struct Sprite *); void AnimFollowMeFinger(struct Sprite *);
void AnimTauntFinger(struct Sprite *); void AnimTauntFinger(struct Sprite *);
void SetSpriteNextToMonHead(u8 battler, struct Sprite* sprite); void SetSpriteNextToMonHead(u8 battler, struct Sprite* sprite);
void sub_80A2F0C(u8 taskId); void AnimTask_ShrinkTargetCopy(u8 taskId);
// battle_anim_effects_2.c // battle_anim_effects_2.c
extern const union AffineAnimCmd *const gGrowingRingAffineAnimTable[]; extern const union AffineAnimCmd *const gGrowingRingAffineAnimTable[];
@@ -421,9 +421,9 @@ void AnimThrowProjectile(struct Sprite *sprite);
void AnimSnoreZ(struct Sprite *sprite); void AnimSnoreZ(struct Sprite *sprite);
s16 CloneBattlerSpriteWithBlend(u8 animBattler); s16 CloneBattlerSpriteWithBlend(u8 animBattler);
void obj_delete_but_dont_free_vram(struct Sprite *sprite); void obj_delete_but_dont_free_vram(struct Sprite *sprite);
void sub_8076048(u8 taskId); void AnimTask_AlphaFadeIn(u8 taskId);
void AnimTask_BlendMonInAndOut(u8 task); void AnimTask_BlendMonInAndOut(u8 task);
void sub_8076288(u8 taskId); void AnimTask_BlendPalInAndOutByTag(u8 taskId);
void PrepareAffineAnimInTaskData(struct Task *task, u8 spriteId, const union AffineAnimCmd *affineAnimCmds); void PrepareAffineAnimInTaskData(struct Task *task, u8 spriteId, const union AffineAnimCmd *affineAnimCmds);
bool8 RunAffineAnimFromTaskData(struct Task *task); bool8 RunAffineAnimFromTaskData(struct Task *task);
void SetBattlerSpriteYOffsetFromYScale(u8 spriteId); void SetBattlerSpriteYOffsetFromYScale(u8 spriteId);
@@ -445,7 +445,7 @@ u8 sub_8076E34(s32 battlerId, u8 spriteId, s32 species);
void sub_8076ED8(struct Sprite *sprite); void sub_8076ED8(struct Sprite *sprite);
void sub_8076F58(struct Sprite *sprite); void sub_8076F58(struct Sprite *sprite);
void sub_8076FD0(struct Sprite *sprite); void sub_8076FD0(struct Sprite *sprite);
void sub_8077030(u8 taskId); void AnimTask_AttackerPunchWithTrace(u8 taskId);
void sub_807729C(struct Sprite *sprite); void sub_807729C(struct Sprite *sprite);
void AnimWeatherBallDown(struct Sprite *sprite); void AnimWeatherBallDown(struct Sprite *sprite);
@@ -457,82 +457,82 @@ void AnimTask_ShakeAndSinkMon(u8 taskId);
void AnimTask_TranslateMonElliptical(u8 taskId); void AnimTask_TranslateMonElliptical(u8 taskId);
void AnimTask_TranslateMonEllipticalRespectSide(u8 taskId); void AnimTask_TranslateMonEllipticalRespectSide(u8 taskId);
void AnimTask_WindUpLunge(u8 taskId); void AnimTask_WindUpLunge(u8 taskId);
void sub_80995FC(u8 taskId); void AnimTask_SlideOffScreen(u8 taskId);
void AnimTask_SwayMon(u8 taskId); void AnimTask_SwayMon(u8 taskId);
void AnimTask_ScaleMonAndRestore(u8 taskId); void AnimTask_ScaleMonAndRestore(u8 taskId);
void sub_8099980(u8 taskId); void AnimTask_RotateMonSpriteToSide(u8 taskId);
void sub_8099A78(u8 taskId); void AnimTask_RotateMonToSideAndRestore(u8 taskId);
void sub_8099BD4(u8 taskId); void AnimTask_ShakeTargetBasedOnMovePowerOrDmg(u8 taskId);
// normal.c // normal.c
extern const struct SpriteTemplate gUnknown_83E7C98; extern const struct SpriteTemplate gFlashingHitSplatSpriteTemplate;
extern const struct SpriteTemplate gBasicHitSplatSpriteTemplate; extern const struct SpriteTemplate gBasicHitSplatSpriteTemplate;
extern const struct SpriteTemplate gWaterHitSplatSpriteTemplate; extern const struct SpriteTemplate gWaterHitSplatSpriteTemplate;
u32 UnpackSelectedBattleAnimPalettes(s16 selector); u32 UnpackSelectedBattleAnimPalettes(s16 selector);
void AnimTask_CurseBlendEffect(u8 taskId); void AnimTask_CurseBlendEffect(u8 taskId);
void sub_80B9CE4(u8 taskId); void AnimTask_BlendColorCycleExclude(u8 taskId);
void sub_80B9E58(u8 taskId); void AnimTask_BlendColorCycleByTag(u8 taskId);
void sub_80B9F6C(u8 taskId); void AnimTask_FlashAnimTagWithColor(u8 taskId);
void sub_80BA0E8(u8 taskId); void AnimTask_InvertScreenColor(u8 taskId);
void sub_80BA47C(u8 taskId); void AnimTask_ShakeBattleTerrain(u8 taskId);
// ground.c // ground.c
void sub_80B8E94(u8 taskId); void AnimTask_DigDownMovement(u8 taskId);
void sub_80B90EC(u8 taskId); void AnimTask_DigUpMovement(u8 taskId);
void AnimTask_HorizontalShake(u8 taskId); void AnimTask_HorizontalShake(u8 taskId);
void AnimTask_IsPowerOver99(u8 taskId); void AnimTask_IsPowerOver99(u8 taskId);
void sub_80B9800(u8 taskId); void AnimTask_PositionFissureBgOnBattler(u8 taskId);
// dragon.c // dragon.c
void sub_80B75E0(u8 taskId); void AnimTask_DragonDanceWaver(u8 taskId);
// ghost.c // ghost.c
void sub_80B54E8(u8 taskId); void AnimTask_NightShadeClone(u8 taskId);
void sub_80B58AC(u8 taskId); void AnimTask_NightmareClone(u8 taskId);
void sub_80B5AAC(u8 taskId); void AnimTask_SpiteTargetShadow(u8 taskId);
void sub_80B6020(u8 taskId); void AnimTask_DestinyBondWhiteShadow(u8 taskId);
void sub_80B63B4(u8 taskId); void AnimTask_CurseStretchingBlackBg(u8 taskId);
void sub_80B68C8(u8 taskId); void AnimTask_GrudgeFlames(u8 taskId);
void sub_80B6BBC(u8 taskId); void sub_80B6BBC(u8 taskId);
// rock.c // rock.c
void AnimTask_LoadSandstormBackground(u8 taskId); void AnimTask_LoadSandstormBackground(u8 taskId);
void sub_80B4BD0(u8 taskId); void AnimTask_Rollout(u8 taskId);
void AnimTask_GetSeismicTossDamageLevel(u8 taskId); void AnimTask_GetSeismicTossDamageLevel(u8 taskId);
void sub_80B5188(u8 taskId); void AnimTask_MoveSeismicTossBg(u8 taskId);
void sub_80B51EC(u8 taskId); void AnimTask_SeismicTossBgAccelerateDownAtEnd(u8 taskId);
// psychic.c // psychic.c
void sub_80B3418(u8 taskId); void AnimTask_MeditateStretchAttacker(u8 taskId);
void sub_80B3480(u8 taskId); void AnimTask_Teleport(u8 taskId);
void sub_80B3584(u8 taskId); void AnimTask_ImprisonOrbs(u8 taskId);
void sub_80B3834(u8 taskId); void AnimTask_SkillSwap(u8 taskId);
void sub_80B3A58(u8 taskId); void AnimTask_ExtrasensoryDistortion(u8 taskId);
void sub_80B3C78(u8 taskId); void AnimTask_TransparentCloneGrowAndShrink(u8 taskId);
// dark.c // dark.c
extern const union AffineAnimCmd *const gUnknown_83E7910[]; extern const union AffineAnimCmd *const gAffineAnims_Bite[];
void sub_80B78E0(u8 taskId); void AnimTask_AttackerFadeToInvisible(u8 taskId);
void sub_80B79DC(u8 taskId); void AnimTask_AttackerFadeFromInvisible(u8 taskId);
void sub_80B7A80(u8 taskId); void AnimTask_InitAttackerFadeFromInvisible(u8 taskId);
void sub_80B7DA4(u8 taskId); void AnimTask_MoveAttackerMementoShadow(u8 taskId);
void sub_80B8070(u8 taskId); void AnimTask_MoveTargetMementoShadow(u8 taskId);
void sub_80B85B8(u8 taskId); void AnimTask_InitMementoShadow(u8 taskId);
void sub_80B8664(u8 taskId); void sub_80B8664(u8 taskId);
void AnimTask_MetallicShine(u8 taskId); void AnimTask_MetallicShine(u8 taskId);
void AnimTask_SetGreyscaleOrOriginalPal(u8 taskId); void AnimTask_SetGreyscaleOrOriginalPal(u8 taskId);
void sub_80B8B38(u8 taskId); void GetIsDoomDesireHitTurn(u8 taskId);
// flying.c // flying.c
void sub_80B194C(u8 taskId); void AnimTask_AnimateGustTornadoPalette(u8 taskId);
void sub_80B1D3C(struct Sprite *sprite); void sub_80B1D3C(struct Sprite *sprite);
void sub_80B2868(u8 taskId); void AnimTask_DrillPeckHitSplats(u8 taskId);
// poison.c // poison.c
extern const union AffineAnimCmd *const gAffineAnims_Droplet[]; extern const union AffineAnimCmd *const gAffineAnims_Droplet[];
// fighting.c // fighting.c
void sub_80B1530(u8 taskId); void AnimTask_MoveSkyUppercutBg(u8 taskId);
// ice.c // ice.c
extern const union AnimCmd *const gAnims_SmallBubblePair[]; extern const union AnimCmd *const gAnims_SmallBubblePair[];
@@ -542,19 +542,19 @@ void AnimTask_Hail1(u8 taskId);
void AnimTask_GetRolloutCounter(u8 taskId); void AnimTask_GetRolloutCounter(u8 taskId);
// electric.c // electric.c
void sub_80AE220(u8 taskId); void AnimTask_ElectricBolt(u8 taskId);
void sub_80AE540(u8 taskId); void AnimTask_ElectricChargingParticles(u8 taskId);
void sub_80AE8A0(u8 taskId); void AnimTask_VoltTackleAttackerReappear(u8 taskId);
void sub_80AEA10(u8 taskId); void AnimTask_VoltTackleBolt(u8 taskId);
void sub_80AECE0(u8 taskId); void AnimTask_ShockWaveProgressingBolt(u8 taskId);
void sub_80AEFA0(u8 taskId); void AnimTask_ShockWaveLightning(u8 taskId);
// fire.c // fire.c
extern const union AnimCmd *const gUnknown_83E5D48[]; extern const union AnimCmd *const gAnims_BasicFire[];
void sub_80ACEA4(u8 taskId); void AnimTask_EruptionLaunchRocks(u8 taskId);
void sub_80ADAD8(u8 taskId); void AnimTask_ShakeTargetInPattern(u8 taskId);
void AnimTask_BlendBackground(u8 taskId); void AnimTask_BlendBackground(u8 taskId);
void sub_80AD800(u8 taskId); void AnimTask_MoveHeatWaveTargets(u8 taskId);
// water.c // water.c
extern const union AnimCmd *const gAnims_WaterMudOrb[]; extern const union AnimCmd *const gAnims_WaterMudOrb[];
@@ -574,25 +574,25 @@ void AnimTask_CloneBattlerSpriteWithBlend(u8 taskId);
void AnimTask_SetUpCurseBackground(u8 taskId); void AnimTask_SetUpCurseBackground(u8 taskId);
void sub_80BB088(u8 taskId); void sub_80BB088(u8 taskId);
void sub_80BB660(u8 taskId); void sub_80BB660(u8 taskId);
void sub_80BB7DC(u8 taskId); void AnimTask_BlendNonAttackerPalettes(u8 taskId);
void sub_80BB82C(u8 taskId); void AnimTask_StartSlidingBg(u8 taskId);
void AnimTask_GetAttackerSide(u8 taskId); void AnimTask_GetAttackerSide(u8 taskId);
void AnimTask_GetTargetSide(u8 taskId); void AnimTask_GetTargetSide(u8 taskId);
void AnimTask_GetTargetIsAttackerPartner(u8 taskId); void AnimTask_GetTargetIsAttackerPartner(u8 taskId);
void sub_80BB9B0(u8 taskId); void AnimTask_SetAllNonAttackersInvisiblity(u8 taskId);
void sub_80BBA20(u8 taskId, s32 unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u32 *gfx, const u32 *tilemap, const u32 *palette); void sub_80BBA20(u8 taskId, s32 unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u32 *gfx, const u32 *tilemap, const u32 *palette);
void AnimTask_GetBattleTerrain(u8 taskId); void AnimTask_GetBattleTerrain(u8 taskId);
void sub_80BBE10(u8 taskId); void AnimTask_AllocBackupPalBuffer(u8 taskId);
void sub_80BBE3C(u8 taskId); void AnimTask_FreeBackupPalBuffer(u8 taskId);
void sub_80BBE6C(u8 taskId); void AnimTask_CopyPalUnfadedToBackup(u8 taskId);
void sub_80BBF08(u8 taskId); void AnimTask_CopyPalUnfadedFromBackup(u8 taskId);
void sub_80BBFA4(u8 taskId); void AnimTask_CopyPalFadedToUnfaded(u8 taskId);
void AnimTask_IsContest(u8 taskId); void AnimTask_IsContest(u8 taskId);
void sub_80BC060(u8 taskId); void AnimTask_SetAnimAttackerAndTargetForEffectTgt(u8 taskId);
void AnimTask_IsTargetSameSide(u8 taskId); void AnimTask_IsTargetSameSide(u8 taskId);
void sub_80BC0DC(u8 taskId); void AnimTask_SetAnimTargetToBattlerTarget(u8 taskId);
void sub_80BC0FC(u8 taskId); void AnimTask_SetAnimAttackerAndTargetForEffectAtk(u8 taskId);
void sub_80BC12C(u8 taskId); void AnimTask_SetAttackerInvisibleWaitForSignal(u8 taskId);
// battle_anim_scripts.s // battle_anim_scripts.s
extern const u8 *const gBattleAnims_StatusConditions[]; extern const u8 *const gBattleAnims_StatusConditions[];
src/battle_anim_effects_1.c
+2 -2
View File
@@ -2767,7 +2767,7 @@ static void AnimConstrictBindingStep2(struct Sprite* sprite)
} }
} }
void sub_80A2F0C(u8 taskId) void AnimTask_ShrinkTargetCopy(u8 taskId)
{ {
u8 spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); u8 spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
@@ -3605,7 +3605,7 @@ static void AnimFlyingParticleStep(struct Sprite* sprite)
DestroySpriteAndMatrix(sprite); DestroySpriteAndMatrix(sprite);
} }
void sub_80A41C4(u8 taskId) void AnimTask_CycleMagicalLeafPal(u8 taskId)
{ {
struct Task* task = &gTasks[taskId]; struct Task* task = &gTasks[taskId];
src/battle_anim_effects_2.c
+9 -9
View File
@@ -32,7 +32,7 @@ static void AnimTask_SplashStep(u8);
static void AnimTask_GrowAndShrinkStep(u8); static void AnimTask_GrowAndShrinkStep(u8);
static void ThrashMoveMonStep(u8); static void ThrashMoveMonStep(u8);
static void ThrashMoveMon(u8); static void ThrashMoveMon(u8);
static void AnimTask_SketchDrawMon(u8); static void AnimTask_SketchDrawMon_Step(u8);
static void AnimPencil_Step(struct Sprite *); static void AnimPencil_Step(struct Sprite *);
static void AnimSoftBoiledEgg_Step1(struct Sprite *); static void AnimSoftBoiledEgg_Step1(struct Sprite *);
static void AnimSoftBoiledEgg_Step2(struct Sprite *); static void AnimSoftBoiledEgg_Step2(struct Sprite *);
@@ -115,7 +115,7 @@ static const struct SpriteTemplate sUnknown_83E3B30 =
.oam = &gOamData_AffineNormal_ObjBlend_64x64, .oam = &gOamData_AffineNormal_ObjBlend_64x64,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E7910, .affineAnims = gAffineAnims_Bite,
.callback = sub_80A7020, .callback = sub_80A7020,
}; };
@@ -2347,7 +2347,7 @@ static void ThrashMoveMon(u8 taskId)
} }
} }
void sub_80A8874(u8 taskId) void AnimTask_SketchDrawMon(u8 taskId)
{ {
struct Task* task = &gTasks[taskId]; struct Task* task = &gTasks[taskId];
struct ScanlineEffectParams params; struct ScanlineEffectParams params;
@@ -2385,10 +2385,10 @@ void sub_80A8874(u8 taskId)
params.initState = 1; params.initState = 1;
params.unused9 = 0; params.unused9 = 0;
ScanlineEffect_SetParams(params); ScanlineEffect_SetParams(params);
task->func = AnimTask_SketchDrawMon; task->func = AnimTask_SketchDrawMon_Step;
} }
static void AnimTask_SketchDrawMon(u8 taskId) static void AnimTask_SketchDrawMon_Step(u8 taskId)
{ {
struct Task* task = &gTasks[taskId]; struct Task* task = &gTasks[taskId];
@@ -2983,7 +2983,7 @@ void AnimSpeedDust(struct Sprite *sprite)
} }
} }
void sub_80A96B4(u8 taskId) void AnimTask_LoadMusicNotesPals(u8 taskId)
{ {
int i; int i;
u8 paletteNums[3]; u8 paletteNums[3];
@@ -3001,7 +3001,7 @@ void sub_80A96B4(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_80A9760(u8 taskId) void AnimTask_FreeMusicNotesPals(u8 taskId)
{ {
int i; int i;
@@ -3101,7 +3101,7 @@ static void FakeOutStep2(u8 taskId)
} }
} }
void sub_80A9A20(u8 taskId) void AnimTask_StretchTargetUp(u8 taskId)
{ {
u8 spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); u8 spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
@@ -3122,7 +3122,7 @@ void sub_80A9A20(u8 taskId)
} }
} }
void sub_80A9AB0(u8 taskId) void AnimTask_StretchAttackerUp(u8 taskId)
{ {
u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
src/battle_anim_effects_3.c
+2 -2
View File
@@ -3571,7 +3571,7 @@ static void sub_80E1AD8(u8 taskId)
} }
} }
void sub_80E1C48(u8 taskId) void AnimTask_SlideMonForFocusBand(u8 taskId)
{ {
gTasks[taskId].data[15] = gBattlerSpriteIds[gBattleAnimAttacker]; gTasks[taskId].data[15] = gBattlerSpriteIds[gBattleAnimAttacker];
gTasks[taskId].data[14] = gBattleAnimArgs[0]; gTasks[taskId].data[14] = gBattleAnimArgs[0];
@@ -3751,7 +3751,7 @@ static void AnimTask_FacadeColorBlendStep(u8 taskId)
} }
} }
void sub_80E2084(u8 taskId) void AnimTask_StatusClearedEffect(u8 taskId)
{ {
sub_80BBA20(taskId, 0, 0x1A0, gBattleAnimAttacker, gBattleAnimArgs[0], 10, 2, 30, gCureBubblesGfx, gCureBubblesTilemap, gCureBubblesPal); sub_80BBA20(taskId, 0, 0x1A0, gBattleAnimAttacker, gBattleAnimArgs[0], 10, 2, 30, gCureBubblesGfx, gCureBubblesTilemap, gCureBubblesPal);
} }
src/battle_anim_mon_movement.c
+5 -5
View File
@@ -73,7 +73,7 @@ const struct SpriteTemplate gSlideMonToOffsetSpriteTemplate =
.callback = SlideMonToOffset, .callback = SlideMonToOffset,
}; };
const struct SpriteTemplate gUnknown_83D4EB4 = const struct SpriteTemplate gSlideMonToOffsetAndBackSpriteTemplate =
{ {
.tileTag = 0, .tileTag = 0,
.paletteTag = 0, .paletteTag = 0,
@@ -620,7 +620,7 @@ static void AnimTask_WindUpLungePart2(u8 taskId)
} }
} }
void sub_80995FC(u8 taskId) void AnimTask_SlideOffScreen(u8 taskId)
{ {
u8 spriteId; u8 spriteId;
@@ -772,7 +772,7 @@ static void AnimTask_ScaleMonAndRestoreStep(u8 taskId)
} }
} }
void sub_8099980(u8 taskId) void AnimTask_RotateMonSpriteToSide(u8 taskId)
{ {
u8 spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[2]); u8 spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[2]);
PrepareBattlerSpriteForRotScale(spriteId, 0); PrepareBattlerSpriteForRotScale(spriteId, 0);
@@ -805,7 +805,7 @@ void sub_8099980(u8 taskId)
gTasks[taskId].func = sub_8099B54; gTasks[taskId].func = sub_8099B54;
} }
void sub_8099A78(u8 taskId) void AnimTask_RotateMonToSideAndRestore(u8 taskId)
{ {
u8 spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[2]); u8 spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[2]);
PrepareBattlerSpriteForRotScale(spriteId, 0); PrepareBattlerSpriteForRotScale(spriteId, 0);
@@ -866,7 +866,7 @@ static void sub_8099B54(u8 taskId)
} }
} }
void sub_8099BD4(u8 taskId) void AnimTask_ShakeTargetBasedOnMovePowerOrDmg(u8 taskId)
{ {
if (gBattleAnimArgs[0] == 0) if (gBattleAnimArgs[0] == 0)
{ {
src/battle_anim_mons.c
+3 -3
View File
@@ -1466,7 +1466,7 @@ void obj_delete_but_dont_free_vram(struct Sprite *sprite)
DestroySprite(sprite); DestroySprite(sprite);
} }
void sub_8076048(u8 taskId) void AnimTask_AlphaFadeIn(u8 taskId)
{ {
s16 v1 = 0, v2 = 0; s16 v1 = 0, v2 = 0;
@@ -1584,7 +1584,7 @@ static void AnimTask_BlendMonInAndOutStep(u8 taskId)
} }
} }
void sub_8076288(u8 taskId) void AnimTask_BlendPalInAndOutByTag(u8 taskId)
{ {
u8 palette = IndexOfSpritePaletteTag(gBattleAnimArgs[0]); u8 palette = IndexOfSpritePaletteTag(gBattleAnimArgs[0]);
@@ -2117,7 +2117,7 @@ void sub_8076FD0(struct Sprite *sprite)
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
} }
void sub_8077030(u8 taskId) void AnimTask_AttackerPunchWithTrace(u8 taskId)
{ {
u16 src; u16 src;
u16 dest; u16 dest;
src/battle_anim_sound_tasks.c
+7 -7
View File
@@ -66,7 +66,7 @@ static void sub_80DCEE4(u8 taskId)
} }
} }
void mas_80DCF38(u8 taskId) void SoundTask_LoopSEAdjustPanning(u8 taskId)
{ {
u16 songId = gBattleAnimArgs[0]; u16 songId = gBattleAnimArgs[0];
s8 targetPan = gBattleAnimArgs[2]; s8 targetPan = gBattleAnimArgs[2];
@@ -116,7 +116,7 @@ static void sub_80DCFE8(u8 taskId)
} }
} }
void sub_80DD06C(u8 taskId) void SoundTask_PlayCryHighPitch(u8 taskId)
{ {
u16 species = SPECIES_NONE; u16 species = SPECIES_NONE;
u8 battlerId; u8 battlerId;
@@ -147,7 +147,7 @@ void sub_80DD06C(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_80DD148(u8 taskId) void SoundTask_PlayDoubleCry(u8 taskId)
{ {
u16 species = SPECIES_NONE; u16 species = SPECIES_NONE;
u8 battlerId; u8 battlerId;
@@ -214,7 +214,7 @@ static void sub_80DD270(u8 taskId)
} }
} }
void sub_80DD2F4(u8 taskId) void SoundTask_WaitForCry(u8 taskId)
{ {
if (gTasks[taskId].data[9] < 2) if (gTasks[taskId].data[9] < 2)
++gTasks[taskId].data[9]; ++gTasks[taskId].data[9];
@@ -259,7 +259,7 @@ static void sub_80DD390(u8 taskId)
} }
} }
void sub_80DD3DC(u8 taskId) void SoundTask_PlaySE1WithPanning(u8 taskId)
{ {
u16 songId = gBattleAnimArgs[0]; u16 songId = gBattleAnimArgs[0];
s8 pan = BattleAnimAdjustPanning(gBattleAnimArgs[1]); s8 pan = BattleAnimAdjustPanning(gBattleAnimArgs[1]);
@@ -268,7 +268,7 @@ void sub_80DD3DC(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_80DD410(u8 taskId) void SoundTask_PlaySE2WithPanning(u8 taskId)
{ {
u16 songId = gBattleAnimArgs[0]; u16 songId = gBattleAnimArgs[0];
s8 pan = BattleAnimAdjustPanning(gBattleAnimArgs[1]); s8 pan = BattleAnimAdjustPanning(gBattleAnimArgs[1]);
@@ -277,7 +277,7 @@ void sub_80DD410(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_80DD444(u8 taskId) void SoundTask_AdjustPanningVar(u8 taskId)
{ {
s8 targetPan = gBattleAnimArgs[1]; s8 targetPan = gBattleAnimArgs[1];
s8 panIncrement = gBattleAnimArgs[2]; s8 panIncrement = gBattleAnimArgs[2];
src/battle_anim_special.c
+12 -12
View File
@@ -397,7 +397,7 @@ static const union AnimCmd *const sSpriteAnimTable_840C20C[] =
sUnknown_840C204, sUnknown_840C204,
}; };
const struct SpriteTemplate gUnknown_840C210 = const struct SpriteTemplate gSafariRockTemplate =
{ {
.tileTag = ANIM_TAG_ROCKS, .tileTag = ANIM_TAG_ROCKS,
.paletteTag = ANIM_TAG_ROCKS, .paletteTag = ANIM_TAG_ROCKS,
@@ -534,7 +534,7 @@ void sub_80EEFC8(u8 *paletteId1, u8 *paletteId2, u8 battler)
gSprites[spriteId2].oam.paletteNum = *paletteId2; gSprites[spriteId2].oam.paletteNum = *paletteId2;
} }
void sub_80EF0B4(u8 taskId) void AnimTask_LoadHealthboxPalsForLevelUp(u8 taskId)
{ {
u8 paletteId1, paletteId2; u8 paletteId1, paletteId2;
@@ -560,13 +560,13 @@ void sub_80EF0E0(u8 battler)
gSprites[spriteId2].oam.paletteNum = paletteId2; gSprites[spriteId2].oam.paletteNum = paletteId2;
} }
void sub_80EF180(u8 taskId) void AnimTask_FreeHealthboxPalsForLevelUp(u8 taskId)
{ {
sub_80EF0E0(gBattleAnimAttacker); sub_80EF0E0(gBattleAnimAttacker);
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_80EF1A0(u8 taskId) void AnimTask_FlashHealthboxOnLevelUp(u8 taskId)
{ {
gTasks[taskId].data[10] = gBattleAnimArgs[0]; gTasks[taskId].data[10] = gBattleAnimArgs[0];
gTasks[taskId].data[11] = gBattleAnimArgs[1]; gTasks[taskId].data[11] = gBattleAnimArgs[1];
@@ -610,7 +610,7 @@ static void sub_80EF1CC(u8 taskId)
} }
} }
void sub_80EF298(u8 taskId) void AnimTask_SwitchOutShrinkMon(u8 taskId)
{ {
u8 spriteId; u8 spriteId;
@@ -637,7 +637,7 @@ void sub_80EF298(u8 taskId)
} }
} }
void sub_80EF344(u8 taskId) void AnimTask_SwitchOutBallEffect(u8 taskId)
{ {
u8 spriteId; u8 spriteId;
u16 ball; u16 ball;
@@ -672,7 +672,7 @@ void sub_80EF344(u8 taskId)
} }
} }
void sub_80EF490(u8 taskId) void AnimTask_LoadBallGfx(u8 taskId)
{ {
u8 ballId = ItemIdToBallId(gLastUsedItem); u8 ballId = ItemIdToBallId(gLastUsedItem);
@@ -680,7 +680,7 @@ void sub_80EF490(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_80EF4B8(u8 taskId) void AnimTask_FreeBallGfx(u8 taskId)
{ {
u8 ballId = ItemIdToBallId(gLastUsedItem); u8 ballId = ItemIdToBallId(gLastUsedItem);
@@ -738,7 +738,7 @@ u8 ItemIdToBallId(u16 ballItem)
} }
} }
void sub_80EF5AC(u8 taskId) void AnimTask_ThrowBall(u8 taskId)
{ {
u8 ballId; u8 ballId;
u8 spriteId; u8 spriteId;
@@ -762,7 +762,7 @@ static void sub_80EF698(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_80EF6D4(u8 taskId) void AnimTask_ThrowBallSpecial(u8 taskId)
{ {
int x, y; int x, y;
u8 ballId; u8 ballId;
@@ -1942,7 +1942,7 @@ static void sub_80F13C0(u8 taskId)
} }
} }
void sub_80F1420(u8 taskId) void AnimTask_SwapMonSpriteToFromSubstitute(u8 taskId)
{ {
u8 spriteId; u8 spriteId;
u32 x; u32 x;
@@ -2000,7 +2000,7 @@ void sub_80F1420(u8 taskId)
} }
} }
void sub_80F15C8(u8 taskId) void AnimTask_SubstituteFadeToInvisible(u8 taskId)
{ {
u8 spriteId; u8 spriteId;
src/battle_anim_status_effects.c
+3 -3
View File
@@ -68,7 +68,7 @@ static const union AnimCmd *const sSpriteAnimTable_83BF430[] =
sUnknown_83BF428 sUnknown_83BF428
}; };
const struct SpriteTemplate gSpriteTemplate_83BF434 = const struct SpriteTemplate gWeatherBallUpSpriteTemplate =
{ {
.tileTag = ANIM_TAG_WEATHER_BALL, .tileTag = ANIM_TAG_WEATHER_BALL,
.paletteTag = ANIM_TAG_WEATHER_BALL, .paletteTag = ANIM_TAG_WEATHER_BALL,
@@ -79,7 +79,7 @@ const struct SpriteTemplate gSpriteTemplate_83BF434 =
.callback = sub_807729C, .callback = sub_807729C,
}; };
const struct SpriteTemplate gSpriteTemplate_83BF44C = const struct SpriteTemplate gWeatherBallNormalDownSpriteTemplate =
{ {
.tileTag = ANIM_TAG_WEATHER_BALL, .tileTag = ANIM_TAG_WEATHER_BALL,
.paletteTag = ANIM_TAG_WEATHER_BALL, .paletteTag = ANIM_TAG_WEATHER_BALL,
@@ -343,7 +343,7 @@ static void sub_8078380(struct Sprite *sprite)
} }
} }
void sub_80783FC(u8 taskId) void AnimTask_FrozenIceCube(u8 taskId)
{ {
s16 x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) - 32; s16 x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) - 32;
s16 y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) - 36; s16 y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) - 36;
src/battle_anim_utility_funcs.c
+13 -13
View File
@@ -577,7 +577,7 @@ static void sub_80BB4B8(u8 taskId)
} }
} }
void sub_80BB660(u8 taskId) void AnimTask_Flash(u8 taskId)
{ {
u32 selectedPalettes = SelectBattlerSpritePalettes(1, 1, 1, 1); u32 selectedPalettes = SelectBattlerSpritePalettes(1, 1, 1, 1);
@@ -646,7 +646,7 @@ static void sub_80BB790(u32 selectedPalettes, u16 color)
gPlttBufferFaded[curOffset] = color; gPlttBufferFaded[curOffset] = color;
} }
void sub_80BB7DC(u8 taskId) void AnimTask_BlendNonAttackerPalettes(u8 taskId)
{ {
s32 j; s32 j;
u32 battler, selectedPalettes = 0; u32 battler, selectedPalettes = 0;
@@ -659,7 +659,7 @@ void sub_80BB7DC(u8 taskId)
StartBlendAnimSpriteColor(taskId, selectedPalettes); StartBlendAnimSpriteColor(taskId, selectedPalettes);
} }
void sub_80BB82C(u8 taskId) void AnimTask_StartSlidingBg(u8 taskId)
{ {
u8 newTaskId; u8 newTaskId;
@@ -712,7 +712,7 @@ void AnimTask_GetTargetIsAttackerPartner(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_80BB9B0(u8 taskId) void AnimTask_SetAllNonAttackersInvisiblity(u8 taskId)
{ {
u16 battler; u16 battler;
@@ -837,19 +837,19 @@ void AnimTask_GetBattleTerrain(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_80BBE10(u8 taskId) void AnimTask_AllocBackupPalBuffer(u8 taskId)
{ {
gMonSpritesGfxPtr->field_17C = AllocZeroed(0x2000); gMonSpritesGfxPtr->field_17C = AllocZeroed(0x2000);
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_80BBE3C(u8 taskId) void AnimTask_FreeBackupPalBuffer(u8 taskId)
{ {
FREE_AND_SET_NULL(gMonSpritesGfxPtr->field_17C); FREE_AND_SET_NULL(gMonSpritesGfxPtr->field_17C);
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_80BBE6C(u8 taskId) void AnimTask_CopyPalUnfadedToBackup(u8 taskId)
{ {
u32 selectedPalettes; u32 selectedPalettes;
s32 paletteIndex = 0; s32 paletteIndex = 0;
@@ -867,7 +867,7 @@ void sub_80BBE6C(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_80BBF08(u8 taskId) void AnimTask_CopyPalUnfadedFromBackup(u8 taskId)
{ {
u32 selectedPalettes; u32 selectedPalettes;
s32 paletteIndex = 0; s32 paletteIndex = 0;
@@ -885,7 +885,7 @@ void sub_80BBF08(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_80BBFA4(u8 taskId) void AnimTask_CopyPalFadedToUnfaded(u8 taskId)
{ {
u32 selectedPalettes; u32 selectedPalettes;
s32 paletteIndex = 0; s32 paletteIndex = 0;
@@ -912,7 +912,7 @@ void AnimTask_IsContest(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_80BC060(u8 taskId) void AnimTask_SetAnimAttackerAndTargetForEffectTgt(u8 taskId)
{ {
gBattleAnimAttacker = gBattlerTarget; gBattleAnimAttacker = gBattlerTarget;
gBattleAnimTarget = gEffectBattler; gBattleAnimTarget = gEffectBattler;
@@ -928,20 +928,20 @@ void AnimTask_IsTargetSameSide(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_80BC0DC(u8 taskId) void AnimTask_SetAnimTargetToBattlerTarget(u8 taskId)
{ {
gBattleAnimTarget = gBattlerTarget; gBattleAnimTarget = gBattlerTarget;
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_80BC0FC(u8 taskId) void AnimTask_SetAnimAttackerAndTargetForEffectAtk(u8 taskId)
{ {
gBattleAnimAttacker = gBattlerAttacker; gBattleAnimAttacker = gBattlerAttacker;
gBattleAnimTarget = gEffectBattler; gBattleAnimTarget = gEffectBattler;
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_80BC12C(u8 taskId) void AnimTask_SetAttackerInvisibleWaitForSignal(u8 taskId)
{ {
if (IsContest()) if (IsContest())
{ {
src/bug.c
+43 -43
View File
@@ -3,90 +3,90 @@
#include "gpu_regs.h" #include "gpu_regs.h"
#include "trig.h" #include "trig.h"
static void sub_80B3FAC(struct Sprite *sprite); static void AnimMegahornHorn(struct Sprite *sprite);
static void sub_80B407C(struct Sprite *sprite); static void AnimLeechLifeNeedle(struct Sprite *sprite);
static void AnimTranslateWebThread(struct Sprite *sprite); static void AnimTranslateWebThread(struct Sprite *sprite);
static void sub_80B41F8(struct Sprite *sprite); static void AnimStringWrap(struct Sprite *sprite);
static void sub_80B42C0(struct Sprite *sprite); static void AnimSpiderWeb(struct Sprite *sprite);
static void AnimTranslateStinger(struct Sprite *sprite); static void AnimTranslateStinger(struct Sprite *sprite);
static void AnimMissileArc(struct Sprite *sprite); static void AnimMissileArc(struct Sprite *sprite);
static void sub_80B45D8(struct Sprite *sprite); static void AnimTailGlowOrb(struct Sprite *sprite);
static void sub_80B41C0(struct Sprite *sprite); static void sub_80B41C0(struct Sprite *sprite);
static void sub_80B4274(struct Sprite *sprite); static void sub_80B4274(struct Sprite *sprite);
static void sub_80B42E8(struct Sprite *sprite); static void sub_80B42E8(struct Sprite *sprite);
static void sub_80B4344(struct Sprite *sprite); static void sub_80B4344(struct Sprite *sprite);
static void AnimMissileArcStep(struct Sprite *sprite); static void AnimMissileArcStep(struct Sprite *sprite);
static const union AffineAnimCmd gUnknown_83E71E8[] = static const union AffineAnimCmd sAffineAnim_MegahornHorn_0[] =
{ {
AFFINEANIMCMD_FRAME(0x100, 0x100, 30, 0), AFFINEANIMCMD_FRAME(0x100, 0x100, 30, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E71F8[] = static const union AffineAnimCmd sAffineAnim_MegahornHorn_1[] =
{ {
AFFINEANIMCMD_FRAME(0x100, 0x100, -99, 0), AFFINEANIMCMD_FRAME(0x100, 0x100, -99, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E7208[] = static const union AffineAnimCmd sAffineAnim_MegahornHorn_2[] =
{ {
AFFINEANIMCMD_FRAME(0x100, 0x100, 94, 0), AFFINEANIMCMD_FRAME(0x100, 0x100, 94, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gUnknown_83E7218[] = static const union AffineAnimCmd *const sAffineAnims_MegahornHorn[] =
{ {
gUnknown_83E71E8, sAffineAnim_MegahornHorn_0,
gUnknown_83E71F8, sAffineAnim_MegahornHorn_1,
gUnknown_83E7208, sAffineAnim_MegahornHorn_2,
}; };
const struct SpriteTemplate gUnknown_83E7224 = const struct SpriteTemplate gMegahornHornSpriteTemplate =
{ {
.tileTag = ANIM_TAG_HORN_HIT_2, .tileTag = ANIM_TAG_HORN_HIT_2,
.paletteTag = ANIM_TAG_HORN_HIT_2, .paletteTag = ANIM_TAG_HORN_HIT_2,
.oam = &gOamData_AffineDouble_ObjNormal_32x16, .oam = &gOamData_AffineDouble_ObjNormal_32x16,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E7218, .affineAnims = sAffineAnims_MegahornHorn,
.callback = sub_80B3FAC, .callback = AnimMegahornHorn,
}; };
static const union AffineAnimCmd gUnknown_83E723C[] = static const union AffineAnimCmd sAffineAnim_LeechLifeNeedle_0[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, -33, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, -33, 1),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E724C[] = static const union AffineAnimCmd sAffineAnim_LeechLifeNeedle_1[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, 96, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, 96, 1),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E725C[] = static const union AffineAnimCmd sAffineAnim_LeechLifeNeedle_2[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, -96, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, -96, 1),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gUnknown_83E726C[] = static const union AffineAnimCmd *const sAffineAnims_LeechLifeNeedle[] =
{ {
gUnknown_83E723C, sAffineAnim_LeechLifeNeedle_0,
gUnknown_83E724C, sAffineAnim_LeechLifeNeedle_1,
gUnknown_83E725C, sAffineAnim_LeechLifeNeedle_2,
}; };
const struct SpriteTemplate gUnknown_83E7278 = const struct SpriteTemplate gLeechLifeNeedleSpriteTemplate =
{ {
.tileTag = ANIM_TAG_NEEDLE, .tileTag = ANIM_TAG_NEEDLE,
.paletteTag = ANIM_TAG_NEEDLE, .paletteTag = ANIM_TAG_NEEDLE,
.oam = &gOamData_AffineNormal_ObjNormal_16x16, .oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E726C, .affineAnims = sAffineAnims_LeechLifeNeedle,
.callback = sub_80B407C, .callback = AnimLeechLifeNeedle,
}; };
const struct SpriteTemplate gWebThreadSpriteTemplate = const struct SpriteTemplate gWebThreadSpriteTemplate =
@@ -100,7 +100,7 @@ const struct SpriteTemplate gWebThreadSpriteTemplate =
.callback = AnimTranslateWebThread, .callback = AnimTranslateWebThread,
}; };
const struct SpriteTemplate gUnknown_83E72A8 = const struct SpriteTemplate gStringWrapSpriteTemplate =
{ {
.tileTag = ANIM_TAG_STRING, .tileTag = ANIM_TAG_STRING,
.paletteTag = ANIM_TAG_STRING, .paletteTag = ANIM_TAG_STRING,
@@ -108,19 +108,19 @@ const struct SpriteTemplate gUnknown_83E72A8 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B41F8, .callback = AnimStringWrap,
}; };
static const union AffineAnimCmd gUnknown_83E72C0[] = static const union AffineAnimCmd sAffineAnim_SpiderWeb[] =
{ {
AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0), AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0),
AFFINEANIMCMD_FRAME(0x6, 0x6, 0, 1), AFFINEANIMCMD_FRAME(0x6, 0x6, 0, 1),
AFFINEANIMCMD_JUMP(1), AFFINEANIMCMD_JUMP(1),
}; };
static const union AffineAnimCmd *const gUnknown_83E72D8[] = static const union AffineAnimCmd *const sAffineAnims_SpiderWeb[] =
{ {
gUnknown_83E72C0, sAffineAnim_SpiderWeb,
}; };
const struct SpriteTemplate gSpiderWebSpriteTemplate = const struct SpriteTemplate gSpiderWebSpriteTemplate =
@@ -130,8 +130,8 @@ const struct SpriteTemplate gSpiderWebSpriteTemplate =
.oam = &gOamData_AffineDouble_ObjBlend_64x64, .oam = &gOamData_AffineDouble_ObjBlend_64x64,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E72D8, .affineAnims = sAffineAnims_SpiderWeb,
.callback = sub_80B42C0, .callback = AnimSpiderWeb,
}; };
const struct SpriteTemplate gLinearStingerSpriteTemplate = const struct SpriteTemplate gLinearStingerSpriteTemplate =
@@ -167,7 +167,7 @@ const struct SpriteTemplate gIcicleSpearSpriteTemplate =
.callback = AnimMissileArc, .callback = AnimMissileArc,
}; };
static const union AffineAnimCmd gUnknown_83E733C[] = static const union AffineAnimCmd sAffineAnim_TailGlowOrb[] =
{ {
AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0), AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0),
AFFINEANIMCMD_FRAME(0x8, 0x8, 0, 18), AFFINEANIMCMD_FRAME(0x8, 0x8, 0, 18),
@@ -178,23 +178,23 @@ static const union AffineAnimCmd gUnknown_83E733C[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gUnknown_83E7374[] = static const union AffineAnimCmd *const sAffineAnims_TailGlowOrb[] =
{ {
gUnknown_83E733C, sAffineAnim_TailGlowOrb,
}; };
const struct SpriteTemplate gUnknown_83E7378 = const struct SpriteTemplate gTailGlowOrbSpriteTemplate =
{ {
.tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.oam = &gOamData_AffineNormal_ObjBlend_64x64, .oam = &gOamData_AffineNormal_ObjBlend_64x64,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E7374, .affineAnims = sAffineAnims_TailGlowOrb,
.callback = sub_80B45D8, .callback = AnimTailGlowOrb,
}; };
static void sub_80B3FAC(struct Sprite *sprite) static void AnimMegahornHorn(struct Sprite *sprite)
{ {
if (IsContest()) if (IsContest())
{ {
@@ -219,7 +219,7 @@ static void sub_80B3FAC(struct Sprite *sprite)
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
} }
static void sub_80B407C(struct Sprite *sprite) static void AnimLeechLifeNeedle(struct Sprite *sprite)
{ {
if (IsContest()) if (IsContest())
{ {
@@ -280,7 +280,7 @@ static void sub_80B41C0(struct Sprite *sprite)
sprite->data[6] = (sprite->data[6] + 13) & 0xFF; sprite->data[6] = (sprite->data[6] + 13) & 0xFF;
} }
static void sub_80B41F8(struct Sprite *sprite) static void AnimStringWrap(struct Sprite *sprite)
{ {
SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y); SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
@@ -306,7 +306,7 @@ static void sub_80B4274(struct Sprite *sprite)
} }
} }
static void sub_80B42C0(struct Sprite *sprite) static void AnimSpiderWeb(struct Sprite *sprite)
{ {
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND); SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND);
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16, 0)); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16, 0));
@@ -445,7 +445,7 @@ static void AnimMissileArcStep(struct Sprite *sprite)
} }
} }
static void sub_80B45D8(struct Sprite *sprite) static void AnimTailGlowOrb(struct Sprite *sprite)
{ {
if (gBattleAnimArgs[0] == 0) if (gBattleAnimArgs[0] == 0)
{ {
src/dark.c
+58 -58
View File
@@ -7,11 +7,11 @@
#include "util.h" #include "util.h"
static void sub_80B7ACC(struct Sprite *sprite); static void sub_80B7ACC(struct Sprite *sprite);
static void sub_80B7BD4(struct Sprite *sprite); static void AnimBite(struct Sprite *sprite);
static void sub_80B7C88(struct Sprite *sprite); static void AnimTearDrop(struct Sprite *sprite);
static void sub_80B86B0(struct Sprite *sprite); static void AnimClawSlash(struct Sprite *sprite);
static void sub_80B7954(u8 taskId); static void AnimTask_AttackerFadeToInvisible_Step(u8 taskId);
static void sub_80B7A14(u8 taskId); static void AnimTask_AttackerFadeFromInvisible_Step(u8 taskId);
static void sub_80B7B48(struct Sprite *sprite); static void sub_80B7B48(struct Sprite *sprite);
static void sub_80B7C10(struct Sprite *sprite); static void sub_80B7C10(struct Sprite *sprite);
static void sub_80B7C50(struct Sprite *sprite); static void sub_80B7C50(struct Sprite *sprite);
@@ -33,120 +33,120 @@ const struct SpriteTemplate gUnknown_83E7878 =
.callback = sub_80B7ACC, .callback = sub_80B7ACC,
}; };
static const union AffineAnimCmd gUnknown_83E7890[] = static const union AffineAnimCmd sAffineAnim_Bite_0[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E78A0[] = static const union AffineAnimCmd sAffineAnim_Bite_1[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, 32, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, 32, 1),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E78B0[] = static const union AffineAnimCmd sAffineAnim_Bite_2[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, 64, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, 64, 1),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E78C0[] = static const union AffineAnimCmd sAffineAnim_Bite_3[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, 96, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, 96, 1),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E78D0[] = static const union AffineAnimCmd sAffineAnim_Bite_4[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, -128, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, -128, 1),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E78E0[] = static const union AffineAnimCmd sAffineAnim_Bite_5[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, -96, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, -96, 1),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E78F0[] = static const union AffineAnimCmd sAffineAnim_Bite_6[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, -64, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, -64, 1),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E7900[] = static const union AffineAnimCmd sAffineAnim_Bite_7[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, -32, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, -32, 1),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd *const gUnknown_83E7910[] = const union AffineAnimCmd *const gAffineAnims_Bite[] =
{ {
gUnknown_83E7890, sAffineAnim_Bite_0,
gUnknown_83E78A0, sAffineAnim_Bite_1,
gUnknown_83E78B0, sAffineAnim_Bite_2,
gUnknown_83E78C0, sAffineAnim_Bite_3,
gUnknown_83E78D0, sAffineAnim_Bite_4,
gUnknown_83E78E0, sAffineAnim_Bite_5,
gUnknown_83E78F0, sAffineAnim_Bite_6,
gUnknown_83E7900, sAffineAnim_Bite_7,
}; };
const struct SpriteTemplate gUnknown_83E7930 = const struct SpriteTemplate gSharpTeethSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SHARP_TEETH, .tileTag = ANIM_TAG_SHARP_TEETH,
.paletteTag = ANIM_TAG_SHARP_TEETH, .paletteTag = ANIM_TAG_SHARP_TEETH,
.oam = &gOamData_AffineNormal_ObjBlend_64x64, .oam = &gOamData_AffineNormal_ObjBlend_64x64,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E7910, .affineAnims = gAffineAnims_Bite,
.callback = sub_80B7BD4, .callback = AnimBite,
}; };
const struct SpriteTemplate gUnknown_83E7948 = const struct SpriteTemplate gClampJawSpriteTemplate =
{ {
.tileTag = ANIM_TAG_CLAMP, .tileTag = ANIM_TAG_CLAMP,
.paletteTag = ANIM_TAG_CLAMP, .paletteTag = ANIM_TAG_CLAMP,
.oam = &gOamData_AffineNormal_ObjBlend_64x64, .oam = &gOamData_AffineNormal_ObjBlend_64x64,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E7910, .affineAnims = gAffineAnims_Bite,
.callback = sub_80B7BD4, .callback = AnimBite,
}; };
static const union AffineAnimCmd gUnknown_83E7960[] = static const union AffineAnimCmd sAffineAnim_TearDrop_0[] =
{ {
AFFINEANIMCMD_FRAME(0xC0, 0xC0, 80, 0), AFFINEANIMCMD_FRAME(0xC0, 0xC0, 80, 0),
AFFINEANIMCMD_FRAME(0x0, 0x0, -2, 8), AFFINEANIMCMD_FRAME(0x0, 0x0, -2, 8),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E7978[] = static const union AffineAnimCmd sAffineAnim_TearDrop_1[] =
{ {
AFFINEANIMCMD_FRAME(0xC0, 0xC0, -80, 0), AFFINEANIMCMD_FRAME(0xC0, 0xC0, -80, 0),
AFFINEANIMCMD_FRAME(0x0, 0x0, 2, 8), AFFINEANIMCMD_FRAME(0x0, 0x0, 2, 8),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gUnknown_83E7990[] = static const union AffineAnimCmd *const sAffineAnims_TearDrop[] =
{ {
gUnknown_83E7960, sAffineAnim_TearDrop_0,
gUnknown_83E7978, sAffineAnim_TearDrop_1,
}; };
const struct SpriteTemplate gUnknown_83E7998 = const struct SpriteTemplate gTearDropSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SMALL_BUBBLES, .tileTag = ANIM_TAG_SMALL_BUBBLES,
.paletteTag = ANIM_TAG_SMALL_BUBBLES, .paletteTag = ANIM_TAG_SMALL_BUBBLES,
.oam = &gOamData_AffineNormal_ObjNormal_16x16, .oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E7990, .affineAnims = sAffineAnims_TearDrop,
.callback = sub_80B7C88, .callback = AnimTearDrop,
}; };
static const union AnimCmd gUnknown_83E79B0[] = static const union AnimCmd sAnim_ClawSlash_0[] =
{ {
ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(0, 4),
ANIMCMD_FRAME(16, 4), ANIMCMD_FRAME(16, 4),
@@ -156,7 +156,7 @@ static const union AnimCmd gUnknown_83E79B0[] =
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E79C8[] = static const union AnimCmd sAnim_ClawSlash_1[] =
{ {
ANIMCMD_FRAME(0, 4, .hFlip = TRUE), ANIMCMD_FRAME(0, 4, .hFlip = TRUE),
ANIMCMD_FRAME(16, 4, .hFlip = TRUE), ANIMCMD_FRAME(16, 4, .hFlip = TRUE),
@@ -166,24 +166,24 @@ static const union AnimCmd gUnknown_83E79C8[] =
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd *const gUnknown_83E79E0[] = static const union AnimCmd *const sAnims_ClawSlash[] =
{ {
gUnknown_83E79B0, sAnim_ClawSlash_0,
gUnknown_83E79C8, sAnim_ClawSlash_1,
}; };
const struct SpriteTemplate gUnknown_83E79E8 = const struct SpriteTemplate gClawSlashSpriteTemplate =
{ {
.tileTag = ANIM_TAG_CLAW_SLASH, .tileTag = ANIM_TAG_CLAW_SLASH,
.paletteTag = ANIM_TAG_CLAW_SLASH, .paletteTag = ANIM_TAG_CLAW_SLASH,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E79E0, .anims = sAnims_ClawSlash,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B86B0, .callback = AnimClawSlash,
}; };
void sub_80B78E0(u8 taskId) void AnimTask_AttackerFadeToInvisible(u8 taskId)
{ {
s32 battler; s32 battler;
@@ -195,10 +195,10 @@ void sub_80B78E0(u8 taskId)
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG1); SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG1);
else else
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG2); SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG2);
gTasks[taskId].func = sub_80B7954; gTasks[taskId].func = AnimTask_AttackerFadeToInvisible_Step;
} }
static void sub_80B7954(u8 taskId) static void AnimTask_AttackerFadeToInvisible_Step(u8 taskId)
{ {
u8 blendA = gTasks[taskId].data[1] >> 8; u8 blendA = gTasks[taskId].data[1] >> 8;
u8 blendB = gTasks[taskId].data[1]; u8 blendB = gTasks[taskId].data[1];
@@ -222,15 +222,15 @@ static void sub_80B7954(u8 taskId)
} }
} }
void sub_80B79DC(u8 taskId) void AnimTask_AttackerFadeFromInvisible(u8 taskId)
{ {
gTasks[taskId].data[0] = gBattleAnimArgs[0]; gTasks[taskId].data[0] = gBattleAnimArgs[0];
gTasks[taskId].data[1] = BLDALPHA_BLEND(0, 16); gTasks[taskId].data[1] = BLDALPHA_BLEND(0, 16);
gTasks[taskId].func = sub_80B7A14; gTasks[taskId].func = AnimTask_AttackerFadeFromInvisible_Step;
SetGpuReg(REG_OFFSET_BLDALPHA, gTasks[taskId].data[1]); SetGpuReg(REG_OFFSET_BLDALPHA, gTasks[taskId].data[1]);
} }
static void sub_80B7A14(u8 taskId) static void AnimTask_AttackerFadeFromInvisible_Step(u8 taskId)
{ {
u8 blendA = gTasks[taskId].data[1] >> 8; u8 blendA = gTasks[taskId].data[1] >> 8;
u8 blendB = gTasks[taskId].data[1]; u8 blendB = gTasks[taskId].data[1];
@@ -255,7 +255,7 @@ static void sub_80B7A14(u8 taskId)
} }
} }
void sub_80B7A80(u8 taskId) void AnimTask_InitAttackerFadeFromInvisible(u8 taskId)
{ {
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16)); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16));
if (GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) == 1) if (GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) == 1)
@@ -306,7 +306,7 @@ static void sub_80B7B48(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
static void sub_80B7BD4(struct Sprite *sprite) static void AnimBite(struct Sprite *sprite)
{ {
sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.x += gBattleAnimArgs[0];
sprite->pos1.y += gBattleAnimArgs[1]; sprite->pos1.y += gBattleAnimArgs[1];
@@ -337,7 +337,7 @@ static void sub_80B7C50(struct Sprite *sprite)
DestroySpriteAndMatrix(sprite); DestroySpriteAndMatrix(sprite);
} }
static void sub_80B7C88(struct Sprite *sprite) static void AnimTearDrop(struct Sprite *sprite)
{ {
u8 battler; u8 battler;
s8 xOffset; s8 xOffset;
@@ -385,7 +385,7 @@ static void sub_80B7D88(struct Sprite *sprite)
DestroySpriteAndMatrix(sprite); DestroySpriteAndMatrix(sprite);
} }
void sub_80B7DA4(u8 taskId) void AnimTask_MoveAttackerMementoShadow(u8 taskId)
{ {
struct ScanlineEffectParams scanlineParams; struct ScanlineEffectParams scanlineParams;
struct BattleAnimBgData animBg; struct BattleAnimBgData animBg;
@@ -502,7 +502,7 @@ static void sub_80B7F58(u8 taskId)
} }
} }
void sub_80B8070(u8 taskId) void AnimTask_MoveTargetMementoShadow(u8 taskId)
{ {
struct BattleAnimBgData animBg; struct BattleAnimBgData animBg;
struct ScanlineEffectParams scanlineParams; struct ScanlineEffectParams scanlineParams;
@@ -724,7 +724,7 @@ static void sub_80B856C(u8 priority)
} }
} }
void sub_80B85B8(u8 taskId) void AnimTask_InitMementoShadow(u8 taskId)
{ {
bool8 toBG2 = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) ^ 1 ? TRUE : FALSE; bool8 toBG2 = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) ^ 1 ? TRUE : FALSE;
@@ -748,7 +748,7 @@ void sub_80B8664(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
static void sub_80B86B0(struct Sprite *sprite) static void AnimClawSlash(struct Sprite *sprite)
{ {
sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.x += gBattleAnimArgs[0];
sprite->pos1.y += gBattleAnimArgs[1]; sprite->pos1.y += gBattleAnimArgs[1];
@@ -910,7 +910,7 @@ void AnimTask_SetGreyscaleOrOriginalPal(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_80B8B38(u8 taskId) void GetIsDoomDesireHitTurn(u8 taskId)
{ {
if (gAnimMoveTurn < 2) if (gAnimMoveTurn < 2)
gBattleAnimArgs[7] = 0; gBattleAnimArgs[7] = 0;
src/dragon.c
+47 -47
View File
@@ -5,10 +5,10 @@
#include "trig.h" #include "trig.h"
static void sub_80B725C(struct Sprite *sprite); static void sub_80B725C(struct Sprite *sprite);
static void sub_80B741C(struct Sprite *sprite); static void AnimDragonFireToTarget(struct Sprite *sprite);
static void sub_80B73AC(struct Sprite *sprite); static void AnimDragonRageFirePlume(struct Sprite *sprite);
static void sub_80B7448(struct Sprite *sprite); static void AnimDragonDanceOrb(struct Sprite *sprite);
static void sub_80B77E4(struct Sprite *sprite); static void AnimOverheatFlame(struct Sprite *sprite);
static void sub_80B74D8(struct Sprite *sprite); static void sub_80B74D8(struct Sprite *sprite);
static void sub_80B76B0(u8 taskId); static void sub_80B76B0(u8 taskId);
static void sub_80B776C(struct Task *task); static void sub_80B776C(struct Task *task);
@@ -31,7 +31,7 @@ static const union AnimCmd *const gUnknown_83E7728[] =
gUnknown_83E7710, gUnknown_83E7710,
}; };
const struct SpriteTemplate gUnknown_83E772C = const struct SpriteTemplate gOutrageFlameSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SMALL_EMBER, .tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER, .paletteTag = ANIM_TAG_SMALL_EMBER,
@@ -42,7 +42,7 @@ const struct SpriteTemplate gUnknown_83E772C =
.callback = sub_80B725C, .callback = sub_80B725C,
}; };
static const union AnimCmd gUnknown_83E7744[] = static const union AnimCmd sAnim_DragonBreathFire_0[] =
{ {
ANIMCMD_FRAME(16, 3), ANIMCMD_FRAME(16, 3),
ANIMCMD_FRAME(32, 3), ANIMCMD_FRAME(32, 3),
@@ -50,7 +50,7 @@ static const union AnimCmd gUnknown_83E7744[] =
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
static const union AnimCmd gUnknown_83E7754[] = static const union AnimCmd sAnim_DragonBreathFire_1[] =
{ {
ANIMCMD_FRAME(16, 3, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_FRAME(16, 3, .vFlip = TRUE, .hFlip = TRUE),
ANIMCMD_FRAME(32, 3, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_FRAME(32, 3, .vFlip = TRUE, .hFlip = TRUE),
@@ -58,44 +58,44 @@ static const union AnimCmd gUnknown_83E7754[] =
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
static const union AnimCmd *const gUnknown_83E7764[] = static const union AnimCmd *const sAnims_DragonBreathFire[] =
{ {
gUnknown_83E7744, sAnim_DragonBreathFire_0,
gUnknown_83E7754, sAnim_DragonBreathFire_1,
}; };
static const union AffineAnimCmd gUnknown_83E776C[] = static const union AffineAnimCmd sAffineAnim_DragonBreathFire_0[] =
{ {
AFFINEANIMCMD_FRAME(0x50, 0x50, 127, 0), AFFINEANIMCMD_FRAME(0x50, 0x50, 127, 0),
AFFINEANIMCMD_FRAME(0xD, 0xD, 0, 100), AFFINEANIMCMD_FRAME(0xD, 0xD, 0, 100),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E7784[] = static const union AffineAnimCmd sAffineAnim_DragonBreathFire_1[] =
{ {
AFFINEANIMCMD_FRAME(0x50, 0x50, 0, 0), AFFINEANIMCMD_FRAME(0x50, 0x50, 0, 0),
AFFINEANIMCMD_FRAME(0xD, 0xD, 0, 100), AFFINEANIMCMD_FRAME(0xD, 0xD, 0, 100),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gUnknown_83E779C[] = static const union AffineAnimCmd *const sAffineAnims_DragonBreathFire[] =
{ {
gUnknown_83E776C, sAffineAnim_DragonBreathFire_0,
gUnknown_83E7784, sAffineAnim_DragonBreathFire_1,
}; };
const struct SpriteTemplate gUnknown_83E77A4 = const struct SpriteTemplate gDragonBreathFireSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SMALL_EMBER, .tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER, .paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_AffineDouble_ObjNormal_32x32, .oam = &gOamData_AffineDouble_ObjNormal_32x32,
.anims = gUnknown_83E7764, .anims = sAnims_DragonBreathFire,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E779C, .affineAnims = sAffineAnims_DragonBreathFire,
.callback = sub_80B741C, .callback = AnimDragonFireToTarget,
}; };
const union AnimCmd gUnknown_83E77BC[] = const union AnimCmd sAnim_DragonRageFirePlume[] =
{ {
ANIMCMD_FRAME(0, 5), ANIMCMD_FRAME(0, 5),
ANIMCMD_FRAME(16, 5), ANIMCMD_FRAME(16, 5),
@@ -105,23 +105,23 @@ const union AnimCmd gUnknown_83E77BC[] =
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd *const gUnknown_83E77D4[] = static const union AnimCmd *const sAnims_DragonRageFirePlume[] =
{ {
gUnknown_83E77BC, sAnim_DragonRageFirePlume,
}; };
const struct SpriteTemplate gUnknown_83E77D8 = const struct SpriteTemplate gDragonRageFirePlumeSpriteTemplate =
{ {
.tileTag = ANIM_TAG_FIRE_PLUME, .tileTag = ANIM_TAG_FIRE_PLUME,
.paletteTag = ANIM_TAG_FIRE_PLUME, .paletteTag = ANIM_TAG_FIRE_PLUME,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E77D4, .anims = sAnims_DragonRageFirePlume,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B73AC, .callback = AnimDragonRageFirePlume,
}; };
static const union AnimCmd gUnknown_83E77F0[] = static const union AnimCmd sAnim_DragonRageFire[] =
{ {
ANIMCMD_FRAME(16, 3), ANIMCMD_FRAME(16, 3),
ANIMCMD_FRAME(32, 3), ANIMCMD_FRAME(32, 3),
@@ -129,42 +129,42 @@ static const union AnimCmd gUnknown_83E77F0[] =
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
static const union AnimCmd *const gUnknown_83E7800[] = static const union AnimCmd *const sAnims_DragonRageFire[] =
{ {
gUnknown_83E77F0, sAnim_DragonRageFire,
gUnknown_83E77F0, sAnim_DragonRageFire,
}; };
static const union AffineAnimCmd gUnknown_83E7808[] = static const union AffineAnimCmd sAffineAnim_DragonRageFire_0[] =
{ {
AFFINEANIMCMD_FRAME(0x64, 0x64, 127, 1), AFFINEANIMCMD_FRAME(0x64, 0x64, 127, 1),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E7818[] = static const union AffineAnimCmd sAffineAnim_DragonRageFire_1[] =
{ {
AFFINEANIMCMD_FRAME(0x64, 0x64, 0, 1), AFFINEANIMCMD_FRAME(0x64, 0x64, 0, 1),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gUnknown_83E7828[] = static const union AffineAnimCmd *const sAffineAnims_DragonRageFire[] =
{ {
gUnknown_83E7808, sAffineAnim_DragonRageFire_0,
gUnknown_83E7818, sAffineAnim_DragonRageFire_1,
}; };
const struct SpriteTemplate gUnknown_83E7830 = const struct SpriteTemplate gDragonRageFireSpitSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SMALL_EMBER, .tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER, .paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_AffineDouble_ObjNormal_32x32, .oam = &gOamData_AffineDouble_ObjNormal_32x32,
.anims = gUnknown_83E7800, .anims = sAnims_DragonRageFire,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E7828, .affineAnims = sAffineAnims_DragonRageFire,
.callback = sub_80B741C, .callback = AnimDragonFireToTarget,
}; };
const struct SpriteTemplate gUnknown_83E7848 = const struct SpriteTemplate gDragonDanceOrbSpriteTemplate =
{ {
.tileTag = ANIM_TAG_HOLLOW_ORB, .tileTag = ANIM_TAG_HOLLOW_ORB,
.paletteTag = ANIM_TAG_HOLLOW_ORB, .paletteTag = ANIM_TAG_HOLLOW_ORB,
@@ -172,10 +172,10 @@ const struct SpriteTemplate gUnknown_83E7848 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B7448, .callback = AnimDragonDanceOrb,
}; };
const struct SpriteTemplate gUnknown_83E7860 = const struct SpriteTemplate gOverheatFlameSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SMALL_EMBER, .tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER, .paletteTag = ANIM_TAG_SMALL_EMBER,
@@ -183,7 +183,7 @@ const struct SpriteTemplate gUnknown_83E7860 =
.anims = gUnknown_83E7728, .anims = gUnknown_83E7728,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B77E4, .callback = AnimOverheatFlame,
}; };
static void sub_80B725C(struct Sprite *sprite) static void sub_80B725C(struct Sprite *sprite)
@@ -235,7 +235,7 @@ static void sub_80B72F8(struct Sprite *sprite)
StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix); StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
} }
static void sub_80B73AC(struct Sprite *sprite) static void AnimDragonRageFirePlume(struct Sprite *sprite)
{ {
if (gBattleAnimArgs[0] == 0) if (gBattleAnimArgs[0] == 0)
{ {
@@ -253,14 +253,14 @@ static void sub_80B73AC(struct Sprite *sprite)
StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix); StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
} }
static void sub_80B741C(struct Sprite *sprite) static void AnimDragonFireToTarget(struct Sprite *sprite)
{ {
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
StartSpriteAffineAnim(sprite, 1); StartSpriteAffineAnim(sprite, 1);
sub_80B72F8(sprite); sub_80B72F8(sprite);
} }
static void sub_80B7448(struct Sprite *sprite) static void AnimDragonDanceOrb(struct Sprite *sprite)
{ {
u16 r5; u16 r5;
u16 r0; u16 r0;
@@ -319,7 +319,7 @@ static void sub_80B74D8(struct Sprite *sprite)
} }
} }
void sub_80B75E0(u8 taskId) void AnimTask_DragonDanceWaver(u8 taskId)
{ {
struct ScanlineEffectParams sp; struct ScanlineEffectParams sp;
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
@@ -404,7 +404,7 @@ static void sub_80B776C(struct Task *task)
task->data[5] = (task->data[5] + 9) & 0xFF; task->data[5] = (task->data[5] + 9) & 0xFF;
} }
static void sub_80B77E4(struct Sprite *sprite) static void AnimOverheatFlame(struct Sprite *sprite)
{ {
s32 i, r6 = (gBattleAnimArgs[2] * 3) / 5; s32 i, r6 = (gBattleAnimArgs[2] * 3) / 5;
src/electric.c
+124 -124
View File
@@ -4,22 +4,22 @@
#include "sound.h" #include "sound.h"
#include "constants/songs.h" #include "constants/songs.h"
static void sub_80ADBEC(struct Sprite *sprite); static void AnimLightning(struct Sprite *sprite);
static void sub_80ADC58(struct Sprite *sprite); static void sub_80ADC58(struct Sprite *sprite);
static void sub_80ADCB8(struct Sprite *sprite); static void sub_80ADCB8(struct Sprite *sprite);
static void sub_80ADD4C(struct Sprite *sprite); static void sub_80ADD4C(struct Sprite *sprite);
static void sub_80ADEB0(struct Sprite *sprite); static void AnimZapCannonSpark(struct Sprite *sprite);
static void sub_80AE000(struct Sprite *sprite); static void AnimThunderboltOrb(struct Sprite *sprite);
static void sub_80AE06C(struct Sprite *sprite); static void AnimSparkElectricityFlashing(struct Sprite *sprite);
static void sub_80AE1A0(struct Sprite *sprite); static void AnimElectricity(struct Sprite *sprite);
static void sub_80AE420(struct Sprite *sprite); static void AnimElectricBoltSegment(struct Sprite *sprite);
static void sub_80AE470(struct Sprite *sprite); static void AnimThunderWave(struct Sprite *sprite);
static void sub_80AE71C(struct Sprite *sprite); static void AnimGrowingChargeOrb(struct Sprite *sprite);
static void sub_80AE774(struct Sprite *sprite); static void AnimElectricPuff(struct Sprite *sprite);
static void sub_80AE7DC(struct Sprite *sprite); static void AnimVoltTackleOrbSlide(struct Sprite *sprite);
static void sub_80AEC34(struct Sprite *sprite); static void AnimVoltTackleBolt(struct Sprite *sprite);
static void sub_80AEC80(struct Sprite *sprite); static void AnimGrowingShockWaveOrb(struct Sprite *sprite);
static void sub_80AEF60(struct Sprite *sprite); static void AnimShockWaveProgressingBolt(struct Sprite *sprite);
static void sub_80ADC3C(struct Sprite *sprite); static void sub_80ADC3C(struct Sprite *sprite);
static void sub_80ADC9C(struct Sprite *sprite); static void sub_80ADC9C(struct Sprite *sprite);
static void sub_80ADF38(struct Sprite *sprite); static void sub_80ADF38(struct Sprite *sprite);
@@ -34,7 +34,7 @@ static bool8 sub_80AEE74(struct Task *task, u8 taskId);
static bool8 sub_80AF058(struct Task *task, u8 taskId); static bool8 sub_80AF058(struct Task *task, u8 taskId);
static void sub_80AF0C8(struct Sprite *sprite); static void sub_80AF0C8(struct Sprite *sprite);
static const union AnimCmd gUnknown_83E5F1C[] = static const union AnimCmd sAnim_Lightning[] =
{ {
ANIMCMD_FRAME(0, 5), ANIMCMD_FRAME(0, 5),
ANIMCMD_FRAME(16, 5), ANIMCMD_FRAME(16, 5),
@@ -44,20 +44,20 @@ static const union AnimCmd gUnknown_83E5F1C[] =
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd *const gUnknown_83E5F34[] = static const union AnimCmd *const sAnims_Lightning[] =
{ {
gUnknown_83E5F1C, sAnim_Lightning,
}; };
const struct SpriteTemplate gUnknown_83E5F38 = const struct SpriteTemplate gLightningSpriteTemplate =
{ {
.tileTag = ANIM_TAG_LIGHTNING, .tileTag = ANIM_TAG_LIGHTNING,
.paletteTag = ANIM_TAG_LIGHTNING, .paletteTag = ANIM_TAG_LIGHTNING,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5F34, .anims = sAnims_Lightning,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80ADBEC, .callback = AnimLightning,
}; };
static const union AffineAnimCmd gUnknown_83E5F50[] = static const union AffineAnimCmd gUnknown_83E5F50[] =
@@ -111,7 +111,7 @@ const struct SpriteTemplate gUnknown_83E5FAC =
.callback = sub_80ADCB8, .callback = sub_80ADCB8,
}; };
const struct SpriteTemplate gUnknown_83E5FC4 = const struct SpriteTemplate gSparkElectricitySpriteTemplate =
{ {
.tileTag = ANIM_TAG_SPARK_2, .tileTag = ANIM_TAG_SPARK_2,
.paletteTag = ANIM_TAG_SPARK_2, .paletteTag = ANIM_TAG_SPARK_2,
@@ -122,7 +122,7 @@ const struct SpriteTemplate gUnknown_83E5FC4 =
.callback = sub_80ADD4C, .callback = sub_80ADD4C,
}; };
const struct SpriteTemplate gUnknown_83E5FDC = const struct SpriteTemplate gZapCannonBallSpriteTemplate =
{ {
.tileTag = ANIM_TAG_BLACK_BALL_2, .tileTag = ANIM_TAG_BLACK_BALL_2,
.paletteTag = ANIM_TAG_BLACK_BALL_2, .paletteTag = ANIM_TAG_BLACK_BALL_2,
@@ -133,29 +133,29 @@ const struct SpriteTemplate gUnknown_83E5FDC =
.callback = TranslateAnimSpriteToTargetMonLocation, .callback = TranslateAnimSpriteToTargetMonLocation,
}; };
static const union AffineAnimCmd gUnknown_83E5FF4[] = static const union AffineAnimCmd sAffineAnim_FlashingSpark[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, 20, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, 20, 1),
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
static const union AffineAnimCmd *const gUnknown_83E6004[] = static const union AffineAnimCmd *const sAffineAnims_FlashingSpark[] =
{ {
gUnknown_83E5FF4, sAffineAnim_FlashingSpark,
}; };
const struct SpriteTemplate gUnknown_83E6008 = const struct SpriteTemplate gZapCannonSparkSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SPARK_2, .tileTag = ANIM_TAG_SPARK_2,
.paletteTag = ANIM_TAG_SPARK_2, .paletteTag = ANIM_TAG_SPARK_2,
.oam = &gOamData_AffineNormal_ObjNormal_16x16, .oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E6004, .affineAnims = sAffineAnims_FlashingSpark,
.callback = sub_80ADEB0, .callback = AnimZapCannonSpark,
}; };
static const union AnimCmd gUnknown_83E6020[] = static const union AnimCmd sAnim_ThunderboltOrb[] =
{ {
ANIMCMD_FRAME(0, 6), ANIMCMD_FRAME(0, 6),
ANIMCMD_FRAME(16, 6), ANIMCMD_FRAME(16, 6),
@@ -163,12 +163,12 @@ static const union AnimCmd gUnknown_83E6020[] =
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
static const union AnimCmd *const gUnknown_83E6030[] = static const union AnimCmd *const sAnims_ThunderboltOrb[] =
{ {
gUnknown_83E6020, sAnim_ThunderboltOrb,
}; };
static const union AffineAnimCmd gUnknown_83E6034[] = static const union AffineAnimCmd sAffineAnim_ThunderboltOrb[] =
{ {
AFFINEANIMCMD_FRAME(0xE8, 0xE8, 0, 0), AFFINEANIMCMD_FRAME(0xE8, 0xE8, 0, 0),
AFFINEANIMCMD_FRAME(-0x8, -0x8, 0, 10), AFFINEANIMCMD_FRAME(-0x8, -0x8, 0, 10),
@@ -176,31 +176,31 @@ static const union AffineAnimCmd gUnknown_83E6034[] =
AFFINEANIMCMD_JUMP(1), AFFINEANIMCMD_JUMP(1),
}; };
static const union AffineAnimCmd *const gUnknown_83E6054[] = static const union AffineAnimCmd *const sAffineAnims_ThunderboltOrb[] =
{ {
gUnknown_83E6034, sAffineAnim_ThunderboltOrb,
}; };
const struct SpriteTemplate gUnknown_83E6058 = const struct SpriteTemplate gThunderboltOrbSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SHOCK_3, .tileTag = ANIM_TAG_SHOCK_3,
.paletteTag = ANIM_TAG_SHOCK_3, .paletteTag = ANIM_TAG_SHOCK_3,
.oam = &gOamData_AffineNormal_ObjNormal_32x32, .oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = gUnknown_83E6030, .anims = sAnims_ThunderboltOrb,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E6054, .affineAnims = sAffineAnims_ThunderboltOrb,
.callback = sub_80AE000, .callback = AnimThunderboltOrb,
}; };
const struct SpriteTemplate gUnknown_83E6070 = const struct SpriteTemplate gSparkElectricityFlashingSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SPARK_2, .tileTag = ANIM_TAG_SPARK_2,
.paletteTag = ANIM_TAG_SPARK_2, .paletteTag = ANIM_TAG_SPARK_2,
.oam = &gOamData_AffineNormal_ObjNormal_16x16, .oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E6004, .affineAnims = sAffineAnims_FlashingSpark,
.callback = sub_80AE06C, .callback = AnimSparkElectricityFlashing,
}; };
const struct SpriteTemplate gElectricitySpriteTemplate = const struct SpriteTemplate gElectricitySpriteTemplate =
@@ -211,10 +211,10 @@ const struct SpriteTemplate gElectricitySpriteTemplate =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80AE1A0, .callback = AnimElectricity,
}; };
static const struct SpriteTemplate gUnknown_83E60A0 = static const struct SpriteTemplate gElectricBoltSegmentSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SPARK, .tileTag = ANIM_TAG_SPARK,
.paletteTag = ANIM_TAG_SPARK, .paletteTag = ANIM_TAG_SPARK,
@@ -222,10 +222,10 @@ static const struct SpriteTemplate gUnknown_83E60A0 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80AE420, .callback = AnimElectricBoltSegment,
}; };
const struct SpriteTemplate gUnknown_83E60B8 = const struct SpriteTemplate gThunderWaveSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SPARK_H, .tileTag = ANIM_TAG_SPARK_H,
.paletteTag = ANIM_TAG_SPARK_H, .paletteTag = ANIM_TAG_SPARK_H,
@@ -233,10 +233,10 @@ const struct SpriteTemplate gUnknown_83E60B8 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80AE470, .callback = AnimThunderWave,
}; };
static const s8 gUnknown_83E60D0[][2] = static const s8 sElectricChargingParticleCoordOffsets[][2] =
{ {
{ 58, -60}, { 58, -60},
{-56, -36}, {-56, -36},
@@ -256,7 +256,7 @@ static const s8 gUnknown_83E60D0[][2] =
{ 48, 48}, { 48, 48},
}; };
static const union AnimCmd gUnknown_83E60F0[] = static const union AnimCmd sAnim_ElectricChargingParticles_0[] =
{ {
ANIMCMD_FRAME(3, 1), ANIMCMD_FRAME(3, 1),
ANIMCMD_FRAME(2, 1), ANIMCMD_FRAME(2, 1),
@@ -265,7 +265,7 @@ static const union AnimCmd gUnknown_83E60F0[] =
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E6104[] = static const union AnimCmd sAnim_ElectricChargingParticles_1[] =
{ {
ANIMCMD_FRAME(0, 5), ANIMCMD_FRAME(0, 5),
ANIMCMD_FRAME(1, 5), ANIMCMD_FRAME(1, 5),
@@ -274,24 +274,24 @@ static const union AnimCmd gUnknown_83E6104[] =
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd *const gUnknown_83E6118[] = static const union AnimCmd *const sAnims_ElectricChargingParticles[] =
{ {
gUnknown_83E60F0, sAnim_ElectricChargingParticles_0,
gUnknown_83E6104, sAnim_ElectricChargingParticles_1,
}; };
static const struct SpriteTemplate gUnknown_83E6120 = static const struct SpriteTemplate gElectricChargingParticlesSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ELECTRIC_ORBS, .tileTag = ANIM_TAG_ELECTRIC_ORBS,
.paletteTag = ANIM_TAG_ELECTRIC_ORBS, .paletteTag = ANIM_TAG_ELECTRIC_ORBS,
.oam = &gOamData_AffineOff_ObjNormal_8x8, .oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gUnknown_83E6118, .anims = sAnims_ElectricChargingParticles,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = SpriteCallbackDummy, .callback = SpriteCallbackDummy,
}; };
static const union AffineAnimCmd gUnknown_83E6138[] = static const union AffineAnimCmd sAffineAnim_GrowingElectricOrb_0[] =
{ {
AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0), AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0),
AFFINEANIMCMD_FRAME(0x4, 0x4, 0, 60), AFFINEANIMCMD_FRAME(0x4, 0x4, 0, 60),
@@ -303,7 +303,7 @@ static const union AffineAnimCmd gUnknown_83E6138[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E6178[] = static const union AffineAnimCmd sAffineAnim_GrowingElectricOrb_1[] =
{ {
AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0), AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0),
AFFINEANIMCMD_FRAME(0x8, 0x8, 0, 30), AFFINEANIMCMD_FRAME(0x8, 0x8, 0, 30),
@@ -313,7 +313,7 @@ static const union AffineAnimCmd gUnknown_83E6178[] =
AFFINEANIMCMD_JUMP(3), AFFINEANIMCMD_JUMP(3),
}; };
static const union AffineAnimCmd gUnknown_83E61A8[] = static const union AffineAnimCmd sAffineAnim_GrowingElectricOrb_2[] =
{ {
AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0), AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0),
AFFINEANIMCMD_FRAME(0x8, 0x8, 0, 30), AFFINEANIMCMD_FRAME(0x8, 0x8, 0, 30),
@@ -321,25 +321,25 @@ static const union AffineAnimCmd gUnknown_83E61A8[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gUnknown_83E61C8[] = static const union AffineAnimCmd *const sAffineAnims_GrowingElectricOrb[] =
{ {
gUnknown_83E6138, sAffineAnim_GrowingElectricOrb_0,
gUnknown_83E6178, sAffineAnim_GrowingElectricOrb_1,
gUnknown_83E61A8, sAffineAnim_GrowingElectricOrb_2,
}; };
const struct SpriteTemplate gUnknown_83E61D4 = const struct SpriteTemplate gGrowingChargeOrbSpriteTemplate =
{ {
.tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.oam = &gOamData_AffineNormal_ObjBlend_64x64, .oam = &gOamData_AffineNormal_ObjBlend_64x64,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E61C8, .affineAnims = sAffineAnims_GrowingElectricOrb,
.callback = sub_80AE71C, .callback = AnimGrowingChargeOrb,
}; };
static const union AnimCmd gUnknown_83E61EC[] = static const union AnimCmd sAnim_ElectricPuff[] =
{ {
ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(0, 3),
ANIMCMD_FRAME(16, 3), ANIMCMD_FRAME(16, 3),
@@ -348,99 +348,99 @@ static const union AnimCmd gUnknown_83E61EC[] =
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd *const gUnknown_83E6200[] = static const union AnimCmd *const sAnims_ElectricPuff[] =
{ {
gUnknown_83E61EC, sAnim_ElectricPuff,
}; };
const struct SpriteTemplate gUnknown_83E6204 = const struct SpriteTemplate gElectricPuffSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ELECTRICITY, .tileTag = ANIM_TAG_ELECTRICITY,
.paletteTag = ANIM_TAG_ELECTRICITY, .paletteTag = ANIM_TAG_ELECTRICITY,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E6200, .anims = sAnims_ElectricPuff,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80AE774, .callback = AnimElectricPuff,
}; };
const struct SpriteTemplate gUnknown_83E621C = const struct SpriteTemplate gVoltTackleOrbSlideSpriteTemplate =
{ {
.tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.oam = &gOamData_AffineNormal_ObjBlend_64x64, .oam = &gOamData_AffineNormal_ObjBlend_64x64,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E61C8, .affineAnims = sAffineAnims_GrowingElectricOrb,
.callback = sub_80AE7DC, .callback = AnimVoltTackleOrbSlide,
}; };
static const union AnimCmd gUnknown_83E6234[] = static const union AnimCmd sAnim_VoltTackleBolt_0[] =
{ {
ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(0, 3),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E623C[] = static const union AnimCmd sAnim_VoltTackleBolt_1[] =
{ {
ANIMCMD_FRAME(2, 3), ANIMCMD_FRAME(2, 3),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E6244[] = static const union AnimCmd sAnim_VoltTackleBolt_2[] =
{ {
ANIMCMD_FRAME(4, 3), ANIMCMD_FRAME(4, 3),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E624C[] = static const union AnimCmd sAnim_VoltTackleBolt_3[] =
{ {
ANIMCMD_FRAME(6, 3), ANIMCMD_FRAME(6, 3),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd *const gUnknown_83E6254[] = static const union AnimCmd *const sAnims_VoltTackleBolt[] =
{ {
gUnknown_83E6234, sAnim_VoltTackleBolt_0,
gUnknown_83E623C, sAnim_VoltTackleBolt_1,
gUnknown_83E6244, sAnim_VoltTackleBolt_2,
gUnknown_83E624C, sAnim_VoltTackleBolt_3,
}; };
static const union AffineAnimCmd gUnknown_83E6264[] = static const union AffineAnimCmd sAffineAnim_VoltTackleBolt[] =
{ {
AFFINEANIMCMD_FRAME(0x100, 0x100, 64, 0), AFFINEANIMCMD_FRAME(0x100, 0x100, 64, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gUnknown_83E6274[] = static const union AffineAnimCmd *const sAffineAnims_VoltTackleBolt[] =
{ {
gUnknown_83E6264, sAffineAnim_VoltTackleBolt,
}; };
static const struct SpriteTemplate gUnknown_83E6278 = static const struct SpriteTemplate gVoltTackleBoltSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SPARK, .tileTag = ANIM_TAG_SPARK,
.paletteTag = ANIM_TAG_SPARK, .paletteTag = ANIM_TAG_SPARK,
.oam = &gOamData_AffineDouble_ObjNormal_8x16, .oam = &gOamData_AffineDouble_ObjNormal_8x16,
.anims = gUnknown_83E6254, .anims = sAnims_VoltTackleBolt,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E6274, .affineAnims = sAffineAnims_VoltTackleBolt,
.callback = sub_80AEC34, .callback = AnimVoltTackleBolt,
}; };
const struct SpriteTemplate gUnknown_83E6290 = const struct SpriteTemplate gGrowingShockWaveOrbSpriteTemplate =
{ {
.tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.oam = &gOamData_AffineNormal_ObjBlend_64x64, .oam = &gOamData_AffineNormal_ObjBlend_64x64,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E61C8, .affineAnims = sAffineAnims_GrowingElectricOrb,
.callback = sub_80AEC80, .callback = AnimGrowingShockWaveOrb,
}; };
static const struct SpriteTemplate gUnknown_83E62A8 = static const struct SpriteTemplate sShockWaveProgressingBoltSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SPARK, .tileTag = ANIM_TAG_SPARK,
.paletteTag = ANIM_TAG_SPARK, .paletteTag = ANIM_TAG_SPARK,
@@ -448,10 +448,10 @@ static const struct SpriteTemplate gUnknown_83E62A8 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80AEF60, .callback = AnimShockWaveProgressingBolt,
}; };
static void sub_80ADBEC(struct Sprite *sprite) static void AnimLightning(struct Sprite *sprite)
{ {
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
sprite->pos1.x -= gBattleAnimArgs[0]; sprite->pos1.x -= gBattleAnimArgs[0];
@@ -555,7 +555,7 @@ static void sub_80ADD4C(struct Sprite *sprite)
sprite->callback = sub_80B1D3C; sprite->callback = sub_80B1D3C;
} }
static void sub_80ADEB0(struct Sprite *sprite) static void AnimZapCannonSpark(struct Sprite *sprite)
{ {
InitSpritePosToAnimAttacker(sprite, 1); InitSpritePosToAnimAttacker(sprite, 1);
sprite->data[0] = gBattleAnimArgs[3]; sprite->data[0] = gBattleAnimArgs[3];
@@ -599,7 +599,7 @@ static void sub_80ADFB0(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
static void sub_80AE000(struct Sprite *sprite) static void AnimThunderboltOrb(struct Sprite *sprite)
{ {
if (IsContest() || GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) if (IsContest() || GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
gBattleAnimArgs[1] = -gBattleAnimArgs[1]; gBattleAnimArgs[1] = -gBattleAnimArgs[1];
@@ -611,7 +611,7 @@ static void sub_80AE000(struct Sprite *sprite)
sprite->callback = sub_80ADFB0; sprite->callback = sub_80ADFB0;
} }
static void sub_80AE06C(struct Sprite *sprite) static void AnimSparkElectricityFlashing(struct Sprite *sprite)
{ {
u8 battler; u8 battler;
@@ -644,7 +644,7 @@ static void sub_80AE130(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
static void sub_80AE1A0(struct Sprite *sprite) static void AnimElectricity(struct Sprite *sprite)
{ {
InitSpritePosToAnimTarget(sprite, FALSE); InitSpritePosToAnimTarget(sprite, FALSE);
sprite->oam.tileNum += gBattleAnimArgs[3] * 4; sprite->oam.tileNum += gBattleAnimArgs[3] * 4;
@@ -657,7 +657,7 @@ static void sub_80AE1A0(struct Sprite *sprite)
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
} }
void sub_80AE220(u8 taskId) void AnimTask_ElectricBolt(u8 taskId)
{ {
gTasks[taskId].data[0] = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[0]; gTasks[taskId].data[0] = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[0];
gTasks[taskId].data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[1]; gTasks[taskId].data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[1];
@@ -692,30 +692,30 @@ static void sub_80AE278(u8 taskId)
{ {
case 0: case 0:
r12 *= 1; r12 *= 1;
spriteId = CreateSprite(&gUnknown_83E60A0, x, y + r12, 2); spriteId = CreateSprite(&gElectricBoltSegmentSpriteTemplate, x, y + r12, 2);
++r7; ++r7;
break; break;
case 2: case 2:
r12 *= 2; r12 *= 2;
r8 += r2; r8 += r2;
spriteId = CreateSprite(&gUnknown_83E60A0, x, y + r12, 2); spriteId = CreateSprite(&gElectricBoltSegmentSpriteTemplate, x, y + r12, 2);
++r7; ++r7;
break; break;
case 4: case 4:
r12 *= 3; r12 *= 3;
r8 += r2 * 2; r8 += r2 * 2;
spriteId = CreateSprite(&gUnknown_83E60A0, x, y + r12, 2); spriteId = CreateSprite(&gElectricBoltSegmentSpriteTemplate, x, y + r12, 2);
++r7; ++r7;
break; break;
case 6: case 6:
r12 *= 4; r12 *= 4;
r8 += r2 * 3; r8 += r2 * 3;
spriteId = CreateSprite(&gUnknown_83E60A0, x, y + r12, 2); spriteId = CreateSprite(&gElectricBoltSegmentSpriteTemplate, x, y + r12, 2);
++r7; ++r7;
break; break;
case 8: case 8:
r12 *= 5; r12 *= 5;
spriteId = CreateSprite(&gUnknown_83E60A0, x, y + r12, 2); spriteId = CreateSprite(&gElectricBoltSegmentSpriteTemplate, x, y + r12, 2);
++r7; ++r7;
break; break;
case 10: case 10:
@@ -731,7 +731,7 @@ static void sub_80AE278(u8 taskId)
++gTasks[taskId].data[10]; ++gTasks[taskId].data[10];
} }
static void sub_80AE420(struct Sprite *sprite) static void AnimElectricBoltSegment(struct Sprite *sprite)
{ {
if (!sprite->data[0]) if (!sprite->data[0])
{ {
@@ -747,13 +747,13 @@ static void sub_80AE420(struct Sprite *sprite)
DestroySprite(sprite); DestroySprite(sprite);
} }
static void sub_80AE470(struct Sprite *sprite) static void AnimThunderWave(struct Sprite *sprite)
{ {
u8 spriteId; u8 spriteId;
sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.x += gBattleAnimArgs[0];
sprite->pos1.y += gBattleAnimArgs[1]; sprite->pos1.y += gBattleAnimArgs[1];
spriteId = CreateSprite(&gUnknown_83E60B8, sprite->pos1.x + 32, sprite->pos1.y, sprite->subpriority); spriteId = CreateSprite(&gThunderWaveSpriteTemplate, sprite->pos1.x + 32, sprite->pos1.y, sprite->subpriority);
gSprites[spriteId].oam.tileNum += 8; gSprites[spriteId].oam.tileNum += 8;
++gAnimVisualTaskCount; ++gAnimVisualTaskCount;
gSprites[spriteId].callback = sub_80AE4F4; gSprites[spriteId].callback = sub_80AE4F4;
@@ -771,7 +771,7 @@ static void sub_80AE4F4(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
void sub_80AE540(u8 taskId) void AnimTask_ElectricChargingParticles(u8 taskId)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
@@ -807,13 +807,13 @@ static void sub_80AE5BC(u8 taskId)
u8 spriteId; u8 spriteId;
task->data[12] = 0; task->data[12] = 0;
spriteId = CreateSprite(&gUnknown_83E6120, task->data[14], task->data[15], 2); spriteId = CreateSprite(&gElectricChargingParticlesSpriteTemplate, task->data[14], task->data[15], 2);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
struct Sprite *sprite = &gSprites[spriteId]; struct Sprite *sprite = &gSprites[spriteId];
sprite->pos1.x += gUnknown_83E60D0[task->data[9]][0]; sprite->pos1.x += sElectricChargingParticleCoordOffsets[task->data[9]][0];
sprite->pos1.y += gUnknown_83E60D0[task->data[9]][1]; sprite->pos1.y += sElectricChargingParticleCoordOffsets[task->data[9]][1];
sprite->data[0] = 40 - task->data[8] * 5; sprite->data[0] = 40 - task->data[8] * 5;
sprite->data[1] = sprite->pos1.x; sprite->data[1] = sprite->pos1.x;
sprite->data[2] = task->data[14]; sprite->data[2] = task->data[14];
@@ -857,7 +857,7 @@ static void sub_80AE704(struct Sprite *sprite)
sprite->callback = sub_80AE6D0; sprite->callback = sub_80AE6D0;
} }
static void sub_80AE71C(struct Sprite *sprite) static void AnimGrowingChargeOrb(struct Sprite *sprite)
{ {
if (!gBattleAnimArgs[0]) if (!gBattleAnimArgs[0])
{ {
@@ -873,7 +873,7 @@ static void sub_80AE71C(struct Sprite *sprite)
sprite->callback = RunStoredCallbackWhenAffineAnimEnds; sprite->callback = RunStoredCallbackWhenAffineAnimEnds;
} }
static void sub_80AE774(struct Sprite *sprite) static void AnimElectricPuff(struct Sprite *sprite)
{ {
if (!gBattleAnimArgs[0]) if (!gBattleAnimArgs[0])
{ {
@@ -891,7 +891,7 @@ static void sub_80AE774(struct Sprite *sprite)
sprite->callback = RunStoredCallbackWhenAnimEnds; sprite->callback = RunStoredCallbackWhenAnimEnds;
} }
static void sub_80AE7DC(struct Sprite *sprite) static void AnimVoltTackleOrbSlide(struct Sprite *sprite)
{ {
StartSpriteAffineAnim(sprite, 1); StartSpriteAffineAnim(sprite, 1);
sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
@@ -920,7 +920,7 @@ static void sub_80AE83C(struct Sprite *sprite)
} }
} }
void sub_80AE8A0(u8 taskId) void AnimTask_VoltTackleAttackerReappear(u8 taskId)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
@@ -975,7 +975,7 @@ void sub_80AE8A0(u8 taskId)
} }
} }
void sub_80AEA10(u8 taskId) void AnimTask_VoltTackleBolt(u8 taskId)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
@@ -1049,7 +1049,7 @@ void sub_80AEA10(u8 taskId)
static bool8 sub_80AEB98(struct Task *task, u8 taskId) static bool8 sub_80AEB98(struct Task *task, u8 taskId)
{ {
u8 spriteId = CreateSprite(&gUnknown_83E6278, task->data[3], task->data[5], 35); u8 spriteId = CreateSprite(&gVoltTackleBoltSpriteTemplate, task->data[3], task->data[5], 35);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
@@ -1070,7 +1070,7 @@ static bool8 sub_80AEB98(struct Task *task, u8 taskId)
return FALSE; return FALSE;
} }
static void sub_80AEC34(struct Sprite *sprite) static void AnimVoltTackleBolt(struct Sprite *sprite)
{ {
if (++sprite->data[0] > 12) if (++sprite->data[0] > 12)
{ {
@@ -1080,7 +1080,7 @@ static void sub_80AEC34(struct Sprite *sprite)
} }
} }
static void sub_80AEC80(struct Sprite *sprite) static void AnimGrowingShockWaveOrb(struct Sprite *sprite)
{ {
switch (sprite->data[0]) switch (sprite->data[0])
{ {
@@ -1097,7 +1097,7 @@ static void sub_80AEC80(struct Sprite *sprite)
} }
} }
void sub_80AECE0(u8 taskId) void AnimTask_ShockWaveProgressingBolt(u8 taskId)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
@@ -1174,7 +1174,7 @@ void sub_80AECE0(u8 taskId)
static bool8 sub_80AEE74(struct Task *task, u8 taskId) static bool8 sub_80AEE74(struct Task *task, u8 taskId)
{ {
u8 spriteId = CreateSprite(&gUnknown_83E62A8, task->data[6], task->data[7], 35); u8 spriteId = CreateSprite(&sShockWaveProgressingBoltSpriteTemplate, task->data[6], task->data[7], 35);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
gSprites[spriteId].oam.tileNum += task->data[4]; gSprites[spriteId].oam.tileNum += task->data[4];
@@ -1206,7 +1206,7 @@ static bool8 sub_80AEE74(struct Task *task, u8 taskId)
} }
} }
static void sub_80AEF60(struct Sprite *sprite) static void AnimShockWaveProgressingBolt(struct Sprite *sprite)
{ {
if (++sprite->data[0] > 12) if (++sprite->data[0] > 12)
{ {
@@ -1215,7 +1215,7 @@ static void sub_80AEF60(struct Sprite *sprite)
} }
} }
void sub_80AEFA0(u8 taskId) void AnimTask_ShockWaveLightning(u8 taskId)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
@@ -1247,7 +1247,7 @@ void sub_80AEFA0(u8 taskId)
static bool8 sub_80AF058(struct Task *task, u8 taskId) static bool8 sub_80AF058(struct Task *task, u8 taskId)
{ {
u8 spriteId = CreateSprite(&gUnknown_83E5F38, task->data[13], task->data[14], task->data[12]); u8 spriteId = CreateSprite(&gLightningSpriteTemplate, task->data[13], task->data[14], task->data[12]);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
src/fighting.c
+118 -118
View File
@@ -6,23 +6,23 @@
#include "trig.h" #include "trig.h"
static void unc_080B08A0(struct Sprite *sprite); static void unc_080B08A0(struct Sprite *sprite);
static void sub_80B08DC(struct Sprite *sprite); static void AnimSlideHandOrFootToTarget(struct Sprite *sprite);
static void sub_80B0928(struct Sprite *sprite); static void AnimJumpKick(struct Sprite *sprite);
static void AnimBasicFistOrFoot(struct Sprite *sprite); static void AnimBasicFistOrFoot(struct Sprite *sprite);
static void sub_80B09A4(struct Sprite *sprite); static void AnimFistOrFootRandomPos(struct Sprite *sprite);
static void sub_80B0B80(struct Sprite *sprite); static void AnimCrossChopHand(struct Sprite *sprite);
static void sub_80B0C28(struct Sprite *sprite); static void AnimSlidingKick(struct Sprite *sprite);
static void AnimSpinningKickOrPunch(struct Sprite *sprite); static void AnimSpinningKickOrPunch(struct Sprite *sprite);
static void AnimStompFoot(struct Sprite *sprite); static void AnimStompFoot(struct Sprite *sprite);
static void sub_80B0DF0(struct Sprite *sprite); static void AnimDizzyPunchDuck(struct Sprite *sprite);
static void sub_80B0E80(struct Sprite *sprite); static void AnimBrickBreakWall(struct Sprite *sprite);
static void sub_80B0F68(struct Sprite *sprite); static void AnimBrickBreakWallShard(struct Sprite *sprite);
static void sub_80B107C(struct Sprite *sprite); static void AnimSuperpowerOrb(struct Sprite *sprite);
static void sub_80B1188(struct Sprite *sprite); static void AnimSuperpowerRock(struct Sprite *sprite);
static void sub_80B12E8(struct Sprite *sprite); static void AnimSuperpowerFireball(struct Sprite *sprite);
static void sub_80B13F8(struct Sprite *sprite); static void AnimArmThrustHit(struct Sprite *sprite);
static void sub_80B1484(struct Sprite *sprite); static void AnimRevengeScratch(struct Sprite *sprite);
static void sub_80B14F0(struct Sprite *sprite); static void AnimFocusPunchFist(struct Sprite *sprite);
static void sub_80B0B2C(struct Sprite *sprite); static void sub_80B0B2C(struct Sprite *sprite);
static void sub_80B0BD8(struct Sprite *sprite); static void sub_80B0BD8(struct Sprite *sprite);
static void sub_80B0CB4(struct Sprite *sprite); static void sub_80B0CB4(struct Sprite *sprite);
@@ -46,73 +46,73 @@ const struct SpriteTemplate gUnknown_83E668C =
.callback = unc_080B08A0, .callback = unc_080B08A0,
}; };
static const union AnimCmd gUnknown_83E66A4[] = static const union AnimCmd sAnim_HandOrFoot[] =
{ {
ANIMCMD_FRAME(0, 1), ANIMCMD_FRAME(0, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E66AC[] = static const union AnimCmd sAnim_SlidingKick_0[] =
{ {
ANIMCMD_FRAME(16, 1), ANIMCMD_FRAME(16, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E66B4[] = static const union AnimCmd sAnim_SlidingKick_1[] =
{ {
ANIMCMD_FRAME(32, 1), ANIMCMD_FRAME(32, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E66BC[] = static const union AnimCmd sAnim_CrossChopHand_0[] =
{ {
ANIMCMD_FRAME(48, 1), ANIMCMD_FRAME(48, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E66C4[] = static const union AnimCmd sAnim_CrossChopHand_1[] =
{ {
ANIMCMD_FRAME(48, 1, .hFlip = TRUE), ANIMCMD_FRAME(48, 1, .hFlip = TRUE),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd *const gUnknown_83E66CC[] = static const union AnimCmd *const sAnims_HandOrFoot[] =
{ {
gUnknown_83E66A4, sAnim_HandOrFoot,
}; };
static const union AnimCmd *const gUnknown_83E66D0[] = static const union AnimCmd *const sAnims_SlidingKick[] =
{ {
gUnknown_83E66AC, sAnim_SlidingKick_0,
gUnknown_83E66B4, sAnim_SlidingKick_1,
}; };
static const union AnimCmd *const gUnknown_83E66D8[] = static const union AnimCmd *const sAnims_CrossChopHand[] =
{ {
gUnknown_83E66BC, sAnim_CrossChopHand_0,
gUnknown_83E66C4, sAnim_CrossChopHand_1,
}; };
const struct SpriteTemplate gUnknown_83E66E0 = const struct SpriteTemplate gKarateChopSpriteTemplate =
{ {
.tileTag = ANIM_TAG_HANDS_AND_FEET, .tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET, .paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E66CC, .anims = sAnims_HandOrFoot,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B08DC, .callback = AnimSlideHandOrFootToTarget,
}; };
const struct SpriteTemplate gUnknown_83E66F8 = const struct SpriteTemplate gJumpKickSpriteTemplate =
{ {
.tileTag = ANIM_TAG_HANDS_AND_FEET, .tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET, .paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E66CC, .anims = sAnims_HandOrFoot,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B0928, .callback = AnimJumpKick,
}; };
const struct SpriteTemplate gFistFootSpriteTemplate = const struct SpriteTemplate gFistFootSpriteTemplate =
@@ -120,78 +120,78 @@ const struct SpriteTemplate gFistFootSpriteTemplate =
.tileTag = ANIM_TAG_HANDS_AND_FEET, .tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET, .paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E66CC, .anims = sAnims_HandOrFoot,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimBasicFistOrFoot, .callback = AnimBasicFistOrFoot,
}; };
const struct SpriteTemplate gUnknown_83E6728 = const struct SpriteTemplate gFistFootRandomPosSpriteTemplate =
{ {
.tileTag = ANIM_TAG_HANDS_AND_FEET, .tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET, .paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E66CC, .anims = sAnims_HandOrFoot,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B09A4, .callback = AnimFistOrFootRandomPos,
}; };
const struct SpriteTemplate gUnknown_83E6740 = const struct SpriteTemplate gCrossChopHandSpriteTemplate =
{ {
.tileTag = ANIM_TAG_HANDS_AND_FEET, .tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET, .paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E66D8, .anims = sAnims_CrossChopHand,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B0B80, .callback = AnimCrossChopHand,
}; };
const struct SpriteTemplate gUnknown_83E6758 = const struct SpriteTemplate gSlidingKickSpriteTemplate =
{ {
.tileTag = ANIM_TAG_HANDS_AND_FEET, .tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET, .paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E66D0, .anims = sAnims_SlidingKick,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B0C28, .callback = AnimSlidingKick,
}; };
static const union AffineAnimCmd gUnknown_83E6770[] = static const union AffineAnimCmd sAffineAnim_SpinningHandOrFoot[] =
{ {
AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0), AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
AFFINEANIMCMD_FRAME(-0x8, -0x8, 20, 1), AFFINEANIMCMD_FRAME(-0x8, -0x8, 20, 1),
AFFINEANIMCMD_JUMP(1), AFFINEANIMCMD_JUMP(1),
}; };
static const union AffineAnimCmd *const gUnknown_83E6788[] = static const union AffineAnimCmd *const sAffineAnims_SpinningHandOrFoot[] =
{ {
gUnknown_83E6770, sAffineAnim_SpinningHandOrFoot,
}; };
const struct SpriteTemplate gUnknown_83E678C = const struct SpriteTemplate gSpinningHandOrFootSpriteTemplate =
{ {
.tileTag = ANIM_TAG_HANDS_AND_FEET, .tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET, .paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_AffineDouble_ObjNormal_32x32, .oam = &gOamData_AffineDouble_ObjNormal_32x32,
.anims = gUnknown_83E66CC, .anims = sAnims_HandOrFoot,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E6788, .affineAnims = sAffineAnims_SpinningHandOrFoot,
.callback = AnimSpinningKickOrPunch, .callback = AnimSpinningKickOrPunch,
}; };
static const union AffineAnimCmd gUnknown_83E67A4[] = static const union AffineAnimCmd sAffineAnim_MegaPunchKick[] =
{ {
AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0), AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
AFFINEANIMCMD_FRAME(-0x4, -0x4, 20, 1), AFFINEANIMCMD_FRAME(-0x4, -0x4, 20, 1),
AFFINEANIMCMD_JUMP(1), AFFINEANIMCMD_JUMP(1),
}; };
static const union AffineAnimCmd *const gUnknown_83E67BC[] = static const union AffineAnimCmd *const sAffineAnims_MegaPunchKick[] =
{ {
gUnknown_83E67A4, sAffineAnim_MegaPunchKick,
}; };
const struct SpriteTemplate gMegaPunchKickSpriteTemplate = const struct SpriteTemplate gMegaPunchKickSpriteTemplate =
@@ -199,24 +199,24 @@ const struct SpriteTemplate gMegaPunchKickSpriteTemplate =
.tileTag = ANIM_TAG_HANDS_AND_FEET, .tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET, .paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_AffineDouble_ObjNormal_32x32, .oam = &gOamData_AffineDouble_ObjNormal_32x32,
.anims = gUnknown_83E66CC, .anims = sAnims_HandOrFoot,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E67BC, .affineAnims = sAffineAnims_MegaPunchKick,
.callback = AnimSpinningKickOrPunch, .callback = AnimSpinningKickOrPunch,
}; };
const struct SpriteTemplate gUnknown_83E67D8 = const struct SpriteTemplate gStompFootSpriteTemplate =
{ {
.tileTag = ANIM_TAG_HANDS_AND_FEET, .tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET, .paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E66D0, .anims = sAnims_SlidingKick,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimStompFoot, .callback = AnimStompFoot,
}; };
const struct SpriteTemplate gUnknown_83E67F0 = const struct SpriteTemplate gDizzyPunchDuckSpriteTemplate =
{ {
.tileTag = ANIM_TAG_DUCK, .tileTag = ANIM_TAG_DUCK,
.paletteTag = ANIM_TAG_DUCK, .paletteTag = ANIM_TAG_DUCK,
@@ -224,10 +224,10 @@ const struct SpriteTemplate gUnknown_83E67F0 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B0DF0, .callback = AnimDizzyPunchDuck,
}; };
const struct SpriteTemplate gUnknown_83E6808 = const struct SpriteTemplate gBrickBreakWallSpriteTemplate =
{ {
.tileTag = ANIM_TAG_BLUE_LIGHT_WALL, .tileTag = ANIM_TAG_BLUE_LIGHT_WALL,
.paletteTag = ANIM_TAG_BLUE_LIGHT_WALL, .paletteTag = ANIM_TAG_BLUE_LIGHT_WALL,
@@ -235,10 +235,10 @@ const struct SpriteTemplate gUnknown_83E6808 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B0E80, .callback = AnimBrickBreakWall,
}; };
const struct SpriteTemplate gUnknown_83E6820 = const struct SpriteTemplate gBrickBreakWallShardSpriteTemplate =
{ {
.tileTag = ANIM_TAG_TORN_METAL, .tileTag = ANIM_TAG_TORN_METAL,
.paletteTag = ANIM_TAG_TORN_METAL, .paletteTag = ANIM_TAG_TORN_METAL,
@@ -246,10 +246,10 @@ const struct SpriteTemplate gUnknown_83E6820 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B0F68, .callback = AnimBrickBreakWallShard,
}; };
static const union AffineAnimCmd gUnknown_83E6838[] = static const union AffineAnimCmd sAffineAnim_SuperpowerOrb[] =
{ {
AFFINEANIMCMD_FRAME(0x20, 0x20, 0, 0), AFFINEANIMCMD_FRAME(0x20, 0x20, 0, 0),
AFFINEANIMCMD_FRAME(0x4, 0x4, 0, 64), AFFINEANIMCMD_FRAME(0x4, 0x4, 0, 64),
@@ -258,23 +258,23 @@ static const union AffineAnimCmd gUnknown_83E6838[] =
AFFINEANIMCMD_JUMP(2), AFFINEANIMCMD_JUMP(2),
}; };
static const union AffineAnimCmd *const gUnknown_83E6860[] = static const union AffineAnimCmd *const sAffineAnims_SuperpowerOrb[] =
{ {
gUnknown_83E6838, sAffineAnim_SuperpowerOrb,
}; };
const struct SpriteTemplate gUnknown_83E6864 = const struct SpriteTemplate gSuperpowerOrbSpriteTemplate =
{ {
.tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.oam = &gOamData_AffineDouble_ObjBlend_64x64, .oam = &gOamData_AffineDouble_ObjBlend_64x64,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E6860, .affineAnims = sAffineAnims_SuperpowerOrb,
.callback = sub_80B107C, .callback = AnimSuperpowerOrb,
}; };
const struct SpriteTemplate gUnknown_83E687C = const struct SpriteTemplate gSuperpowerRockSpriteTemplate =
{ {
.tileTag = ANIM_TAG_FLAT_ROCK, .tileTag = ANIM_TAG_FLAT_ROCK,
.paletteTag = ANIM_TAG_FLAT_ROCK, .paletteTag = ANIM_TAG_FLAT_ROCK,
@@ -282,10 +282,10 @@ const struct SpriteTemplate gUnknown_83E687C =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B1188, .callback = AnimSuperpowerRock,
}; };
const struct SpriteTemplate gUnknown_83E6894 = const struct SpriteTemplate gSuperpowerFireballSpriteTemplate =
{ {
.tileTag = ANIM_TAG_METEOR, .tileTag = ANIM_TAG_METEOR,
.paletteTag = ANIM_TAG_METEOR, .paletteTag = ANIM_TAG_METEOR,
@@ -293,21 +293,21 @@ const struct SpriteTemplate gUnknown_83E6894 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B12E8, .callback = AnimSuperpowerFireball,
}; };
const struct SpriteTemplate gUnknown_83E68AC = const struct SpriteTemplate gArmThrustHandSpriteTemplate =
{ {
.tileTag = ANIM_TAG_HANDS_AND_FEET, .tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET, .paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E66CC, .anims = sAnims_HandOrFoot,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B13F8, .callback = AnimArmThrustHit,
}; };
static const union AnimCmd gUnknown_83E68C4[] = static const union AnimCmd sAnim_RevengeSmallScratch_0[] =
{ {
ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(0, 4),
ANIMCMD_FRAME(16, 4), ANIMCMD_FRAME(16, 4),
@@ -315,7 +315,7 @@ static const union AnimCmd gUnknown_83E68C4[] =
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E68D4[] = static const union AnimCmd sAnim_RevengeSmallScratch_1[] =
{ {
ANIMCMD_FRAME(0, 4, .vFlip = TRUE), ANIMCMD_FRAME(0, 4, .vFlip = TRUE),
ANIMCMD_FRAME(16, 4, .vFlip = TRUE), ANIMCMD_FRAME(16, 4, .vFlip = TRUE),
@@ -323,7 +323,7 @@ static const union AnimCmd gUnknown_83E68D4[] =
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E68E4[] = static const union AnimCmd sAnim_RevengeSmallScratch_2[] =
{ {
ANIMCMD_FRAME(0, 4, .hFlip = TRUE), ANIMCMD_FRAME(0, 4, .hFlip = TRUE),
ANIMCMD_FRAME(16, 4, .hFlip = TRUE), ANIMCMD_FRAME(16, 4, .hFlip = TRUE),
@@ -331,84 +331,84 @@ static const union AnimCmd gUnknown_83E68E4[] =
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd *const gUnknown_83E68F4[] = static const union AnimCmd *const sAnims_RevengeSmallScratch[] =
{ {
gUnknown_83E68C4, sAnim_RevengeSmallScratch_0,
gUnknown_83E68D4, sAnim_RevengeSmallScratch_1,
gUnknown_83E68E4, sAnim_RevengeSmallScratch_2,
}; };
const struct SpriteTemplate gUnknown_83E6900 = const struct SpriteTemplate gRevengeSmallScratchSpriteTemplate =
{ {
.tileTag = ANIM_TAG_PURPLE_SCRATCH, .tileTag = ANIM_TAG_PURPLE_SCRATCH,
.paletteTag = ANIM_TAG_PURPLE_SCRATCH, .paletteTag = ANIM_TAG_PURPLE_SCRATCH,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E68F4, .anims = sAnims_RevengeSmallScratch,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B1484, .callback = AnimRevengeScratch,
}; };
static const union AnimCmd gUnknown_83E6918[] = static const union AnimCmd sAnim_RevengeBigScratch_0[] =
{ {
ANIMCMD_FRAME(0, 6), ANIMCMD_FRAME(0, 6),
ANIMCMD_FRAME(64, 6), ANIMCMD_FRAME(64, 6),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E6924[] = static const union AnimCmd sAnim_RevengeBigScratch_1[] =
{ {
ANIMCMD_FRAME(0, 6, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_FRAME(0, 6, .vFlip = TRUE, .hFlip = TRUE),
ANIMCMD_FRAME(64, 6, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_FRAME(64, 6, .vFlip = TRUE, .hFlip = TRUE),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E6930[] = static const union AnimCmd sAnim_RevengeBigScratch_2[] =
{ {
ANIMCMD_FRAME(0, 6, .hFlip = TRUE), ANIMCMD_FRAME(0, 6, .hFlip = TRUE),
ANIMCMD_FRAME(64, 6, .hFlip = TRUE), ANIMCMD_FRAME(64, 6, .hFlip = TRUE),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd *const gUnknown_83E693C[] = static const union AnimCmd *const sAnims_RevengeBigScratch[] =
{ {
gUnknown_83E6918, sAnim_RevengeBigScratch_0,
gUnknown_83E6924, sAnim_RevengeBigScratch_1,
gUnknown_83E6930, sAnim_RevengeBigScratch_2,
}; };
const struct SpriteTemplate gUnknown_83E6948 = const struct SpriteTemplate gRevengeBigScratchSpriteTemplate =
{ {
.tileTag = ANIM_TAG_PURPLE_SWIPE, .tileTag = ANIM_TAG_PURPLE_SWIPE,
.paletteTag = ANIM_TAG_PURPLE_SWIPE, .paletteTag = ANIM_TAG_PURPLE_SWIPE,
.oam = &gOamData_AffineOff_ObjNormal_64x64, .oam = &gOamData_AffineOff_ObjNormal_64x64,
.anims = gUnknown_83E693C, .anims = sAnims_RevengeBigScratch,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B1484, .callback = AnimRevengeScratch,
}; };
static const union AffineAnimCmd gUnknown_83E6960[] = static const union AffineAnimCmd sAffineAnim_FocusPunchFist[] =
{ {
AFFINEANIMCMD_FRAME(0x200, 0x200, 0, 0), AFFINEANIMCMD_FRAME(0x200, 0x200, 0, 0),
AFFINEANIMCMD_FRAME(-0x20, -0x20, 0, 8), AFFINEANIMCMD_FRAME(-0x20, -0x20, 0, 8),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gUnknown_83E6978[] = static const union AffineAnimCmd *const sAffineAnims_FocusPunchFist[] =
{ {
gUnknown_83E6960, sAffineAnim_FocusPunchFist,
}; };
const struct SpriteTemplate gUnknown_83E697C = const struct SpriteTemplate gFocusPunchFistSpriteTemplate =
{ {
.tileTag = ANIM_TAG_HANDS_AND_FEET, .tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET, .paletteTag = ANIM_TAG_HANDS_AND_FEET,
.oam = &gOamData_AffineDouble_ObjNormal_32x32, .oam = &gOamData_AffineDouble_ObjNormal_32x32,
.anims = gUnknown_83E66CC, .anims = sAnims_HandOrFoot,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E6978, .affineAnims = sAffineAnims_FocusPunchFist,
.callback = sub_80B14F0, .callback = AnimFocusPunchFist,
}; };
static void unc_080B08A0(struct Sprite *sprite) static void unc_080B08A0(struct Sprite *sprite)
@@ -420,7 +420,7 @@ static void unc_080B08A0(struct Sprite *sprite)
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
} }
static void sub_80B08DC(struct Sprite *sprite) static void AnimSlideHandOrFootToTarget(struct Sprite *sprite)
{ {
if (gBattleAnimArgs[7] == 1 && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) if (gBattleAnimArgs[7] == 1 && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
{ {
@@ -432,14 +432,14 @@ static void sub_80B08DC(struct Sprite *sprite)
AnimSnoreZ(sprite); AnimSnoreZ(sprite);
} }
static void sub_80B0928(struct Sprite *sprite) static void AnimJumpKick(struct Sprite *sprite)
{ {
if (IsContest()) if (IsContest())
{ {
gBattleAnimArgs[1] = -gBattleAnimArgs[1]; gBattleAnimArgs[1] = -gBattleAnimArgs[1];
gBattleAnimArgs[3] = -gBattleAnimArgs[3]; gBattleAnimArgs[3] = -gBattleAnimArgs[3];
} }
sub_80B08DC(sprite); AnimSlideHandOrFootToTarget(sprite);
} }
// Displays a basic fist or foot sprite for a given duration. // Displays a basic fist or foot sprite for a given duration.
@@ -461,7 +461,7 @@ static void AnimBasicFistOrFoot(struct Sprite *sprite)
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
} }
static void sub_80B09A4(struct Sprite *sprite) static void AnimFistOrFootRandomPos(struct Sprite *sprite)
{ {
u8 battler; u8 battler;
s16 xMod, yMod; s16 xMod, yMod;
@@ -516,7 +516,7 @@ static void sub_80B0B2C(struct Sprite *sprite)
} }
} }
static void sub_80B0B80(struct Sprite *sprite) static void AnimCrossChopHand(struct Sprite *sprite)
{ {
InitSpritePosToAnimTarget(sprite, TRUE); InitSpritePosToAnimTarget(sprite, TRUE);
sprite->data[0] = 30; sprite->data[0] = 30;
@@ -550,7 +550,7 @@ static void sub_80B0BD8(struct Sprite *sprite)
} }
} }
static void sub_80B0C28(struct Sprite *sprite) static void AnimSlidingKick(struct Sprite *sprite)
{ {
if (BATTLE_PARTNER(gBattleAnimAttacker) == gBattleAnimTarget && GetBattlerPosition(gBattleAnimTarget) < B_POSITION_PLAYER_RIGHT) if (BATTLE_PARTNER(gBattleAnimAttacker) == gBattleAnimTarget && GetBattlerPosition(gBattleAnimTarget) < B_POSITION_PLAYER_RIGHT)
gBattleAnimArgs[0] *= -1; gBattleAnimArgs[0] *= -1;
@@ -636,7 +636,7 @@ static void AnimStompFootEnd(struct Sprite *sprite)
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
} }
static void sub_80B0DF0(struct Sprite *sprite) static void AnimDizzyPunchDuck(struct Sprite *sprite)
{ {
if (sprite->data[0] == 0) if (sprite->data[0] == 0)
{ {
@@ -658,7 +658,7 @@ static void sub_80B0DF0(struct Sprite *sprite)
} }
} }
static void sub_80B0E80(struct Sprite *sprite) static void AnimBrickBreakWall(struct Sprite *sprite)
{ {
if (gBattleAnimArgs[0] == 0) if (gBattleAnimArgs[0] == 0)
{ {
@@ -709,7 +709,7 @@ static void sub_80B0EF0(struct Sprite *sprite)
} }
} }
static void sub_80B0F68(struct Sprite *sprite) static void AnimBrickBreakWallShard(struct Sprite *sprite)
{ {
if (gBattleAnimArgs[0] == 0) if (gBattleAnimArgs[0] == 0)
{ {
@@ -756,7 +756,7 @@ static void sub_80B1050(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
static void sub_80B107C(struct Sprite *sprite) static void AnimSuperpowerOrb(struct Sprite *sprite)
{ {
if (gBattleAnimArgs[0] == 0) if (gBattleAnimArgs[0] == 0)
{ {
@@ -792,7 +792,7 @@ static void sub_80B111C(struct Sprite *sprite)
} }
} }
static void sub_80B1188(struct Sprite *sprite) static void AnimSuperpowerRock(struct Sprite *sprite)
{ {
sprite->pos1.x = gBattleAnimArgs[0]; sprite->pos1.x = gBattleAnimArgs[0];
sprite->pos1.y = 120; sprite->pos1.y = 120;
@@ -847,7 +847,7 @@ static void sub_80B12A4(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
static void sub_80B12E8(struct Sprite *sprite) static void AnimSuperpowerFireball(struct Sprite *sprite)
{ {
u8 battler; u8 battler;
@@ -884,7 +884,7 @@ static void sub_80B13D4(struct Sprite *sprite)
++sprite->data[0]; ++sprite->data[0];
} }
static void sub_80B13F8(struct Sprite *sprite) static void AnimArmThrustHit(struct Sprite *sprite)
{ {
u8 turn; u8 turn;
@@ -908,7 +908,7 @@ static void sub_80B13F8(struct Sprite *sprite)
sprite->callback = sub_80B13D4; sprite->callback = sub_80B13D4;
} }
static void sub_80B1484(struct Sprite *sprite) static void AnimRevengeScratch(struct Sprite *sprite)
{ {
if (gBattleAnimArgs[2] == 0) if (gBattleAnimArgs[2] == 0)
InitSpritePosToAnimAttacker(sprite, 0); InitSpritePosToAnimAttacker(sprite, 0);
@@ -922,7 +922,7 @@ static void sub_80B1484(struct Sprite *sprite)
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
} }
static void sub_80B14F0(struct Sprite *sprite) static void AnimFocusPunchFist(struct Sprite *sprite)
{ {
if (sprite->affineAnimEnded) if (sprite->affineAnimEnded)
{ {
@@ -933,7 +933,7 @@ static void sub_80B14F0(struct Sprite *sprite)
} }
} }
void sub_80B1530(u8 taskId) void AnimTask_MoveSkyUppercutBg(u8 taskId)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
src/fire.c
+111 -108
View File
@@ -6,21 +6,21 @@
#include "trig.h" #include "trig.h"
#include "constants/songs.h" #include "constants/songs.h"
static void sub_80AC90C(struct Sprite *sprite); static void AnimFireSpiralInward(struct Sprite *sprite);
static void sub_80AC94C(struct Sprite *sprite); static void AnimFireSpread(struct Sprite *sprite);
static void sub_80ACA00(struct Sprite *sprite); static void AnimLargeFlame(struct Sprite *sprite);
static void sub_80AC990(struct Sprite *sprite); static void AnimFirePlume(struct Sprite *sprite);
static void sub_80ACAA8(struct Sprite *sprite); static void sub_80ACAA8(struct Sprite *sprite);
static void sub_80ACBB0(struct Sprite *sprite); static void sub_80ACBB0(struct Sprite *sprite);
static void AnimEmberFlare(struct Sprite *sprite); static void AnimEmberFlare(struct Sprite *sprite);
static void sub_80ACC44(struct Sprite *sprite); static void AnimBurnFlame(struct Sprite *sprite);
static void AnimFireRing(struct Sprite *sprite); static void AnimFireRing(struct Sprite *sprite);
static void AnimFireCross(struct Sprite *sprite); static void AnimFireCross(struct Sprite *sprite);
static void sub_80ACDE8(struct Sprite *sprite); static void AnimFireSpiralOutward(struct Sprite *sprite);
static void sub_80AD330(struct Sprite *sprite); static void AnimEruptionLaunchRock(struct Sprite *sprite);
static void sub_80AD454(struct Sprite *sprite); static void AnimEruptionFallingRock(struct Sprite *sprite);
static void sub_80AD540(struct Sprite *sprite); static void AnimWillOWispOrb(struct Sprite *sprite);
static void sub_80AD6F4(struct Sprite *sprite); static void AnimWillOWispFire(struct Sprite *sprite);
static void sub_80ACA6C(struct Sprite *sprite); static void sub_80ACA6C(struct Sprite *sprite);
static void sub_80ACB1C(struct Sprite *sprite); static void sub_80ACB1C(struct Sprite *sprite);
static void AnimFireRing_Step1(struct Sprite *sprite); static void AnimFireRing_Step1(struct Sprite *sprite);
@@ -38,7 +38,7 @@ static void sub_80AD4A8(struct Sprite *sprite);
static void sub_80AD690(struct Sprite *sprite); static void sub_80AD690(struct Sprite *sprite);
static void sub_80AD870(u8 taskId); static void sub_80AD870(u8 taskId);
static const union AnimCmd gUnknown_83E5BB8[] = static const union AnimCmd sAnim_FireSpiralSpread_0[] =
{ {
ANIMCMD_FRAME(16, 4), ANIMCMD_FRAME(16, 4),
ANIMCMD_FRAME(32, 4), ANIMCMD_FRAME(32, 4),
@@ -46,7 +46,7 @@ static const union AnimCmd gUnknown_83E5BB8[] =
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
static const union AnimCmd gUnknown_83E5BC8[] = static const union AnimCmd sAnim_FireSpiralSpread_1[] =
{ {
ANIMCMD_FRAME(16, 4, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_FRAME(16, 4, .vFlip = TRUE, .hFlip = TRUE),
ANIMCMD_FRAME(32, 4, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_FRAME(32, 4, .vFlip = TRUE, .hFlip = TRUE),
@@ -54,35 +54,35 @@ static const union AnimCmd gUnknown_83E5BC8[] =
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
static const union AnimCmd *const gUnknown_83E5BD8[] = static const union AnimCmd *const sAnims_FireSpiralSpread[] =
{ {
gUnknown_83E5BB8, sAnim_FireSpiralSpread_0,
gUnknown_83E5BC8, sAnim_FireSpiralSpread_1,
}; };
const struct SpriteTemplate gUnknown_83E5BE0 = const struct SpriteTemplate gFireSpiralInwardSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SMALL_EMBER, .tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER, .paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5BD8, .anims = sAnims_FireSpiralSpread,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80AC90C, .callback = AnimFireSpiralInward,
}; };
const struct SpriteTemplate gUnknown_83E5BF8 = const struct SpriteTemplate gFireSpreadSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SMALL_EMBER, .tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER, .paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5BD8, .anims = sAnims_FireSpiralSpread,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80AC94C, .callback = AnimFireSpread,
}; };
static const union AnimCmd gUnknown_83E5C10[] = static const union AnimCmd sAnim_LargeFlame[] =
{ {
ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(0, 3),
ANIMCMD_FRAME(16, 3), ANIMCMD_FRAME(16, 3),
@@ -95,12 +95,12 @@ static const union AnimCmd gUnknown_83E5C10[] =
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
static const union AnimCmd *const gUnknown_83E5C34[] = static const union AnimCmd *const sAnims_LargeFlame[] =
{ {
gUnknown_83E5C10, sAnim_LargeFlame,
}; };
static const union AnimCmd gUnknown_83E5C38[] = static const union AnimCmd sAnim_FirePlume[] =
{ {
ANIMCMD_FRAME(0, 5), ANIMCMD_FRAME(0, 5),
ANIMCMD_FRAME(16, 5), ANIMCMD_FRAME(16, 5),
@@ -110,54 +110,54 @@ static const union AnimCmd gUnknown_83E5C38[] =
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
static const union AnimCmd *const gUnknown_83E5C50[] = static const union AnimCmd *const sAnims_FirePlume[] =
{ {
gUnknown_83E5C38, sAnim_FirePlume,
}; };
static const union AffineAnimCmd gUnknown_83E5C54[] = static const union AffineAnimCmd sAffineAnim_LargeFlame[] =
{ {
AFFINEANIMCMD_FRAME(0x32, 0x100, 0, 0), AFFINEANIMCMD_FRAME(0x32, 0x100, 0, 0),
AFFINEANIMCMD_FRAME(0x20, 0x0, 0, 7), AFFINEANIMCMD_FRAME(0x20, 0x0, 0, 7),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gUnknown_83E5C6C[] = static const union AffineAnimCmd *const sAffineAnims_LargeFlame[] =
{ {
gUnknown_83E5C54, sAffineAnim_LargeFlame,
}; };
const struct SpriteTemplate gUnknown_83E5C70 = const struct SpriteTemplate gLargeFlameSpriteTemplate =
{ {
.tileTag = ANIM_TAG_FIRE, .tileTag = ANIM_TAG_FIRE,
.paletteTag = ANIM_TAG_FIRE, .paletteTag = ANIM_TAG_FIRE,
.oam = &gOamData_AffineNormal_ObjNormal_32x32, .oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = gUnknown_83E5C34, .anims = sAnims_LargeFlame,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E5C6C, .affineAnims = sAffineAnims_LargeFlame,
.callback = sub_80ACA00, .callback = AnimLargeFlame,
}; };
const struct SpriteTemplate gUnknown_83E5C88 = const struct SpriteTemplate gLargeFlameScatterSpriteTemplate =
{ {
.tileTag = ANIM_TAG_FIRE, .tileTag = ANIM_TAG_FIRE,
.paletteTag = ANIM_TAG_FIRE, .paletteTag = ANIM_TAG_FIRE,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5C34, .anims = sAnims_LargeFlame,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80ACA00, .callback = AnimLargeFlame,
}; };
const struct SpriteTemplate gUnknown_83E5CA0 = const struct SpriteTemplate gFirePlumeSpriteTemplate =
{ {
.tileTag = ANIM_TAG_FIRE_PLUME, .tileTag = ANIM_TAG_FIRE_PLUME,
.paletteTag = ANIM_TAG_FIRE_PLUME, .paletteTag = ANIM_TAG_FIRE_PLUME,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5C50, .anims = sAnims_FirePlume,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80AC990, .callback = AnimFirePlume,
}; };
const struct SpriteTemplate gUnknown_83E5CB8 = const struct SpriteTemplate gUnknown_83E5CB8 =
@@ -165,10 +165,10 @@ const struct SpriteTemplate gUnknown_83E5CB8 =
.tileTag = ANIM_TAG_SMALL_EMBER, .tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER, .paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5C50, .anims = sAnims_FirePlume,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80AC990, .callback = AnimFirePlume,
}; };
static const union AnimCmd gUnknown_83E5CD0[] = static const union AnimCmd gUnknown_83E5CD0[] =
@@ -195,30 +195,30 @@ const struct SpriteTemplate gUnknown_83E5CE4 =
.callback = sub_80ACAA8, .callback = sub_80ACAA8,
}; };
static const union AffineAnimCmd gUnknown_83E5CFC[] = static const union AffineAnimCmd sAffineAnim_SunlightRay[] =
{ {
AFFINEANIMCMD_FRAME(0x50, 0x50, 0, 0), AFFINEANIMCMD_FRAME(0x50, 0x50, 0, 0),
AFFINEANIMCMD_FRAME(0x2, 0x2, 10, 1), AFFINEANIMCMD_FRAME(0x2, 0x2, 10, 1),
AFFINEANIMCMD_JUMP(1), AFFINEANIMCMD_JUMP(1),
}; };
static const union AffineAnimCmd *const gUnknown_83E5D14[] = static const union AffineAnimCmd *const sAffineAnims_SunlightRay[] =
{ {
gUnknown_83E5CFC, sAffineAnim_SunlightRay,
}; };
const struct SpriteTemplate gUnknown_83E5D18 = const struct SpriteTemplate gSunlightRaySpriteTemplate =
{ {
.tileTag = ANIM_TAG_SUNLIGHT, .tileTag = ANIM_TAG_SUNLIGHT,
.paletteTag = ANIM_TAG_SUNLIGHT, .paletteTag = ANIM_TAG_SUNLIGHT,
.oam = &gOamData_AffineNormal_ObjBlend_32x32, .oam = &gOamData_AffineNormal_ObjBlend_32x32,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E5D14, .affineAnims = sAffineAnims_SunlightRay,
.callback = sub_80ACBB0, .callback = sub_80ACBB0,
}; };
static const union AnimCmd gUnknown_83E5D30[] = static const union AnimCmd sAnim_BasicFire[] =
{ {
ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(0, 4),
ANIMCMD_FRAME(16, 4), ANIMCMD_FRAME(16, 4),
@@ -228,9 +228,9 @@ static const union AnimCmd gUnknown_83E5D30[] =
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
const union AnimCmd *const gUnknown_83E5D48[] = const union AnimCmd *const gAnims_BasicFire[] =
{ {
gUnknown_83E5D30, sAnim_BasicFire,
}; };
const struct SpriteTemplate gEmberSpriteTemplate = const struct SpriteTemplate gEmberSpriteTemplate =
@@ -249,44 +249,44 @@ const struct SpriteTemplate gEmberFlareSpriteTemplate =
.tileTag = ANIM_TAG_SMALL_EMBER, .tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER, .paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5D48, .anims = gAnims_BasicFire,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimEmberFlare, .callback = AnimEmberFlare,
}; };
const struct SpriteTemplate gUnknown_83E5D7C = const struct SpriteTemplate gBurnFlameSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SMALL_EMBER, .tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER, .paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5D48, .anims = gAnims_BasicFire,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80ACC44, .callback = AnimBurnFlame,
}; };
const struct SpriteTemplate gUnknown_83E5D94 = const struct SpriteTemplate gFireBlastRingSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SMALL_EMBER, .tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER, .paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5D48, .anims = gAnims_BasicFire,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimFireRing, .callback = AnimFireRing,
}; };
static const union AnimCmd gUnknown_83E5DAC[] = static const union AnimCmd sAnim_FireBlastCross[] =
{ {
ANIMCMD_FRAME(32, 6), ANIMCMD_FRAME(32, 6),
ANIMCMD_FRAME(48, 6), ANIMCMD_FRAME(48, 6),
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
static const union AnimCmd *const gUnknown_83E5DB8[] = static const union AnimCmd *const sAnims_FireBlastCross[] =
{ {
gUnknown_83E5DAC, sAnim_FireBlastCross,
}; };
static const union AffineAnimCmd gUnknown_83E5DBC[] = static const union AffineAnimCmd gUnknown_83E5DBC[] =
@@ -307,40 +307,40 @@ static const union AffineAnimCmd *const gUnknown_83E5DDC[] =
gUnknown_83E5DCC, gUnknown_83E5DCC,
}; };
const struct SpriteTemplate gUnknown_83E5DE4 = const struct SpriteTemplate gFireBlastCrossSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SMALL_EMBER, .tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER, .paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5DB8, .anims = sAnims_FireBlastCross,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimFireCross, .callback = AnimFireCross,
}; };
const struct SpriteTemplate gUnknown_83E5DFC = const struct SpriteTemplate gFireSpiralOutwardSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SMALL_EMBER, .tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER, .paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5D48, .anims = gAnims_BasicFire,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80ACDE8, .callback = AnimFireSpiralOutward,
}; };
const struct SpriteTemplate gUnknown_83E5E14 = const struct SpriteTemplate gWeatherBallFireDownSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SMALL_EMBER, .tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER, .paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5D48, .anims = gAnims_BasicFire,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimWeatherBallDown, .callback = AnimWeatherBallDown,
}; };
static const struct SpriteTemplate gUnknown_83E5E2C = static const struct SpriteTemplate gEruptionLaunchRockSpriteTemplate =
{ {
.tileTag = ANIM_TAG_WARM_ROCK, .tileTag = ANIM_TAG_WARM_ROCK,
.paletteTag = ANIM_TAG_WARM_ROCK, .paletteTag = ANIM_TAG_WARM_ROCK,
@@ -348,10 +348,10 @@ static const struct SpriteTemplate gUnknown_83E5E2C =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80AD330, .callback = AnimEruptionLaunchRock,
}; };
static const s16 sHeatedRockCoords[][2] = static const s16 sEruptionLaunchRockCoords[][2] =
{ {
{-2, -5}, {-2, -5},
{-1, -1}, {-1, -1},
@@ -362,7 +362,7 @@ static const s16 sHeatedRockCoords[][2] =
{ 4, -7}, { 4, -7},
}; };
const struct SpriteTemplate gUnknown_83E5E60 = const struct SpriteTemplate gEruptionFallingRockSpriteTemplate =
{ {
.tileTag = ANIM_TAG_WARM_ROCK, .tileTag = ANIM_TAG_WARM_ROCK,
.paletteTag = ANIM_TAG_WARM_ROCK, .paletteTag = ANIM_TAG_WARM_ROCK,
@@ -370,10 +370,10 @@ const struct SpriteTemplate gUnknown_83E5E60 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80AD454, .callback = AnimEruptionFallingRock,
}; };
static const union AnimCmd gUnknown_83E5E78[] = static const union AnimCmd sAnim_WillOWispOrb_0[] =
{ {
ANIMCMD_FRAME(0, 5), ANIMCMD_FRAME(0, 5),
ANIMCMD_FRAME(4, 5), ANIMCMD_FRAME(4, 5),
@@ -382,44 +382,44 @@ static const union AnimCmd gUnknown_83E5E78[] =
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
static const union AnimCmd gUnknown_83E5E8C[] = static const union AnimCmd sAnim_WillOWispOrb_1[] =
{ {
ANIMCMD_FRAME(16, 5), ANIMCMD_FRAME(16, 5),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E5E94[] = static const union AnimCmd sAnim_WillOWispOrb_2[] =
{ {
ANIMCMD_FRAME(20, 5), ANIMCMD_FRAME(20, 5),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E5E9C[] = static const union AnimCmd sAnim_WillOWispOrb_3[] =
{ {
ANIMCMD_FRAME(20, 5), ANIMCMD_FRAME(20, 5),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd *const gUnknown_83E5EA4[] = static const union AnimCmd *const sAnims_WillOWispOrb[] =
{ {
gUnknown_83E5E78, sAnim_WillOWispOrb_0,
gUnknown_83E5E8C, sAnim_WillOWispOrb_1,
gUnknown_83E5E94, sAnim_WillOWispOrb_2,
gUnknown_83E5E9C, sAnim_WillOWispOrb_3,
}; };
const struct SpriteTemplate gUnknown_83E5EB4 = const struct SpriteTemplate gWillOWispOrbSpriteTemplate =
{ {
.tileTag = ANIM_TAG_WISP_ORB, .tileTag = ANIM_TAG_WISP_ORB,
.paletteTag = ANIM_TAG_WISP_ORB, .paletteTag = ANIM_TAG_WISP_ORB,
.oam = &gOamData_AffineOff_ObjNormal_16x16, .oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gUnknown_83E5EA4, .anims = sAnims_WillOWispOrb,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80AD540, .callback = AnimWillOWispOrb,
}; };
static const union AnimCmd gUnknown_83E5ECC[] = static const union AnimCmd sAnim_WillOWispFire[] =
{ {
ANIMCMD_FRAME(0, 5), ANIMCMD_FRAME(0, 5),
ANIMCMD_FRAME(16, 5), ANIMCMD_FRAME(16, 5),
@@ -428,33 +428,36 @@ static const union AnimCmd gUnknown_83E5ECC[] =
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
static const union AnimCmd *const gUnknown_83E5EE0[] = static const union AnimCmd *const sAnims_WillOWispFire[] =
{ {
gUnknown_83E5ECC, sAnim_WillOWispFire,
}; };
const struct SpriteTemplate gUnknown_83E5EE4 = const struct SpriteTemplate gWillOWispFireSpriteTemplate =
{ {
.tileTag = ANIM_TAG_WISP_FIRE, .tileTag = ANIM_TAG_WISP_FIRE,
.paletteTag = ANIM_TAG_WISP_FIRE, .paletteTag = ANIM_TAG_WISP_FIRE,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5EE0, .anims = sAnims_WillOWispFire,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80AD6F4, .callback = AnimWillOWispFire,
}; };
static const s8 gUnknown_83E5EFC[16] = // Directions for shaking up/down or left/right in AnimTask_ShakeTargetInPattern
// Only first 10 values are ever accessed.
// First pattern results in larger shakes, second results in faster oscillation
static const s8 sShakeDirsPattern0[16] =
{ {
-1, -1, 0, 1, 1, 0, 0, -1, -1, 1, 1, 0, 0, -1, 0, 1, -1, -1, 0, 1, 1, 0, 0, -1, -1, 1, 1, 0, 0, -1, 0, 1,
}; };
static const s8 gUnknown_83E5F0C[16] = static const s8 sShakeDirsPattern1[16] =
{ {
-1, 0, 1, 0, -1, 1, 0, -1, 0, 1, 0, -1, 0, 1, 0, 1, -1, 0, 1, 0, -1, 1, 0, -1, 0, 1, 0, -1, 0, 1, 0, 1,
}; };
static void sub_80AC90C(struct Sprite *sprite) static void AnimFireSpiralInward(struct Sprite *sprite)
{ {
sprite->data[0] = gBattleAnimArgs[0]; sprite->data[0] = gBattleAnimArgs[0];
sprite->data[1] = 0x3C; sprite->data[1] = 0x3C;
@@ -466,7 +469,7 @@ static void sub_80AC90C(struct Sprite *sprite)
sprite->callback(sprite); sprite->callback(sprite);
} }
static void sub_80AC94C(struct Sprite *sprite) static void AnimFireSpread(struct Sprite *sprite)
{ {
SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]); SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]);
sprite->pos1.y += gBattleAnimArgs[1]; sprite->pos1.y += gBattleAnimArgs[1];
@@ -477,7 +480,7 @@ static void sub_80AC94C(struct Sprite *sprite)
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
} }
static void sub_80AC990(struct Sprite *sprite) static void AnimFirePlume(struct Sprite *sprite)
{ {
SetSpriteCoordsToAnimAttackerCoords(sprite); SetSpriteCoordsToAnimAttackerCoords(sprite);
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
@@ -498,7 +501,7 @@ static void sub_80AC990(struct Sprite *sprite)
sprite->callback = sub_80ACA6C; sprite->callback = sub_80ACA6C;
} }
static void sub_80ACA00(struct Sprite *sprite) static void AnimLargeFlame(struct Sprite *sprite)
{ {
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
{ {
@@ -606,7 +609,7 @@ static void AnimEmberFlare(struct Sprite *sprite)
sprite->callback(sprite); sprite->callback(sprite);
} }
static void sub_80ACC44(struct Sprite *sprite) static void AnimBurnFlame(struct Sprite *sprite)
{ {
gBattleAnimArgs[0] = -gBattleAnimArgs[0]; gBattleAnimArgs[0] = -gBattleAnimArgs[0];
gBattleAnimArgs[2] = -gBattleAnimArgs[2]; gBattleAnimArgs[2] = -gBattleAnimArgs[2];
@@ -696,7 +699,7 @@ static void AnimFireCross(struct Sprite *sprite)
sprite->callback = TranslateSpriteLinear; sprite->callback = TranslateSpriteLinear;
} }
static void sub_80ACDE8(struct Sprite *sprite) static void AnimFireSpiralOutward(struct Sprite *sprite)
{ {
InitSpritePosToAnimAttacker(sprite, 1); InitSpritePosToAnimAttacker(sprite, 1);
sprite->data[1] = gBattleAnimArgs[2]; sprite->data[1] = gBattleAnimArgs[2];
@@ -725,7 +728,7 @@ static void sub_80ACE50(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
void sub_80ACEA4(u8 taskId) // initialize animation task for Move_ERUPTION? void AnimTask_EruptionLaunchRocks(u8 taskId) // initialize animation task for Move_ERUPTION?
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
@@ -857,14 +860,14 @@ static void sub_80AD1F8(u8 spriteId, u8 taskId, u8 a3)
} }
for (i = 0, j = 0; i <= 6; ++i) for (i = 0, j = 0; i <= 6; ++i)
{ {
u8 spriteId = CreateSprite(&gUnknown_83E5E2C, x, y, 2); u8 spriteId = CreateSprite(&gEruptionLaunchRockSpriteTemplate, x, y, 2);
if (spriteId != 0x40) if (spriteId != 0x40)
{ {
gSprites[spriteId].oam.tileNum += j * 4 + 0x40; gSprites[spriteId].oam.tileNum += j * 4 + 0x40;
if (++j >= 5) if (++j >= 5)
j = 0; j = 0;
sub_80AD3C8(&gSprites[spriteId], sHeatedRockCoords[i][0] * sign, sHeatedRockCoords[i][1]); sub_80AD3C8(&gSprites[spriteId], sEruptionLaunchRockCoords[i][0] * sign, sEruptionLaunchRockCoords[i][1]);
gSprites[spriteId].data[6] = taskId; gSprites[spriteId].data[6] = taskId;
gSprites[spriteId].data[7] = a3; gSprites[spriteId].data[7] = a3;
++gTasks[taskId].data[a3]; ++gTasks[taskId].data[a3];
@@ -872,7 +875,7 @@ static void sub_80AD1F8(u8 spriteId, u8 taskId, u8 a3)
} }
} }
static void sub_80AD330(struct Sprite *sprite) static void AnimEruptionLaunchRock(struct Sprite *sprite)
{ {
sub_80AD3E4(sprite); sub_80AD3E4(sprite);
if (sprite->invisible) if (sprite->invisible)
@@ -922,7 +925,7 @@ static void sub_80AD3E4(struct Sprite *sprite)
sprite->invisible = TRUE; sprite->invisible = TRUE;
} }
static void sub_80AD454(struct Sprite *sprite) static void AnimEruptionFallingRock(struct Sprite *sprite)
{ {
sprite->pos1.x = gBattleAnimArgs[0]; sprite->pos1.x = gBattleAnimArgs[0];
sprite->pos1.y = gBattleAnimArgs[1]; sprite->pos1.y = gBattleAnimArgs[1];
@@ -971,7 +974,7 @@ static void sub_80AD4A8(struct Sprite *sprite)
} }
//wisp orb //wisp orb
static void sub_80AD540(struct Sprite *sprite) static void AnimWillOWispOrb(struct Sprite *sprite)
{ {
switch (sprite->data[0]) switch (sprite->data[0])
{ {
@@ -1040,7 +1043,7 @@ static void sub_80AD690(struct Sprite *sprite)
} }
//wisp fire //wisp fire
static void sub_80AD6F4(struct Sprite *sprite) static void AnimWillOWispFire(struct Sprite *sprite)
{ {
if (!sprite->data[0]) if (!sprite->data[0])
{ {
@@ -1072,7 +1075,7 @@ static void sub_80AD6F4(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
void sub_80AD800(u8 taskId) void AnimTask_MoveHeatWaveTargets(u8 taskId)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
@@ -1162,7 +1165,7 @@ void AnimTask_BlendBackground(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_80ADAD8(u8 taskId) void AnimTask_ShakeTargetInPattern(u8 taskId)
{ {
s8 unk; s8 unk;
u8 spriteId; u8 spriteId;
@@ -1177,9 +1180,9 @@ void sub_80ADAD8(u8 taskId)
++gTasks[taskId].data[0]; ++gTasks[taskId].data[0];
spriteId = gBattlerSpriteIds[gBattleAnimTarget]; spriteId = gBattlerSpriteIds[gBattleAnimTarget];
if (!gTasks[taskId].data[4]) if (!gTasks[taskId].data[4])
unk = gUnknown_83E5EFC[gTasks[taskId].data[0] % 10]; unk = sShakeDirsPattern0[gTasks[taskId].data[0] % 10];
else else
unk = gUnknown_83E5F0C[gTasks[taskId].data[0] % 10]; unk = sShakeDirsPattern1[gTasks[taskId].data[0] % 10];
if (gTasks[taskId].data[3] == 1) if (gTasks[taskId].data[3] == 1)
gSprites[spriteId].pos2.y = gBattleAnimArgs[1] * unk < 0 ? -(gBattleAnimArgs[1] * unk) : gBattleAnimArgs[1] * unk; gSprites[spriteId].pos2.y = gBattleAnimArgs[1] * unk < 0 ? -(gBattleAnimArgs[1] * unk) : gBattleAnimArgs[1] * unk;
else else
src/flying.c
+96 -96
View File
@@ -5,22 +5,22 @@
#include "constants/battle_anim.h" #include "constants/battle_anim.h"
#include "random.h" #include "random.h"
static void sub_80B18E4(struct Sprite *sprite); static void AnimEllipticalGust(struct Sprite *sprite);
static void sub_80B1A1C(struct Sprite *sprite); static void AnimGustToTarget(struct Sprite *sprite);
static void sub_80B1AB8(struct Sprite *sprite); static void AnimAirWaveCrescent(struct Sprite *sprite);
static void sub_80B1BB0(struct Sprite *sprite); static void AnimFlyBallUp(struct Sprite *sprite);
static void sub_80B1C3C(struct Sprite *sprite); static void AnimFlyBallAttack(struct Sprite *sprite);
static void sub_80B1D88(struct Sprite *sprite); static void AnimFallingFeather(struct Sprite *sprite);
static void sub_80B24C0(struct Sprite *sprite); static void sub_80B24C0(struct Sprite *sprite);
static void sub_80B2514(struct Sprite *sprite); static void sub_80B2514(struct Sprite *sprite);
static void sub_80B2780(struct Sprite *sprite); static void AnimWhirlwindLine(struct Sprite *sprite);
static void sub_80B2914(struct Sprite *sprite); static void AnimBounceBallShrink(struct Sprite *sprite);
static void sub_80B2974(struct Sprite *sprite); static void AnimBounceBallLand(struct Sprite *sprite);
static void sub_80B2A08(struct Sprite *sprite); static void AnimDiveBall(struct Sprite *sprite);
static void sub_80B2AF4(struct Sprite *sprite); static void AnimDiveWaterSplash(struct Sprite *sprite);
static void sub_80B2BD8(struct Sprite *sprite); static void AnimSprayWaterDroplet(struct Sprite *sprite);
static void sub_80B2CE4(struct Sprite *sprite); static void sub_80B2CE4(struct Sprite *sprite);
static void sub_80B2D64(struct Sprite *sprite); static void AnimSkyAttackBird(struct Sprite *sprite);
static void sub_80B190C(struct Sprite *sprite); static void sub_80B190C(struct Sprite *sprite);
static void sub_80B198C(u8 taskId); static void sub_80B198C(u8 taskId);
static void sub_80B1A9C(struct Sprite *sprite); static void sub_80B1A9C(struct Sprite *sprite);
@@ -35,7 +35,7 @@ static void sub_80B2C88(struct Sprite *sprite);
static void sub_80B2CF8(struct Sprite *sprite); static void sub_80B2CF8(struct Sprite *sprite);
static void sub_80B2E20(struct Sprite *sprite); static void sub_80B2E20(struct Sprite *sprite);
const struct SpriteTemplate gUnknown_83E6AE8 = const struct SpriteTemplate gEllipticalGustSpriteTemplate =
{ {
.tileTag = ANIM_TAG_GUST, .tileTag = ANIM_TAG_GUST,
.paletteTag = ANIM_TAG_GUST, .paletteTag = ANIM_TAG_GUST,
@@ -43,33 +43,33 @@ const struct SpriteTemplate gUnknown_83E6AE8 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B18E4, .callback = AnimEllipticalGust,
}; };
static const union AffineAnimCmd gUnknown_83E6B00[] = static const union AffineAnimCmd sAffineAnim_GustToTarget[] =
{ {
AFFINEANIMCMD_FRAME(0x10, 0x100, 0, 0), AFFINEANIMCMD_FRAME(0x10, 0x100, 0, 0),
AFFINEANIMCMD_FRAME(0xA, 0x0, 0, 24), AFFINEANIMCMD_FRAME(0xA, 0x0, 0, 24),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gUnknown_83E6B18[] = static const union AffineAnimCmd *const sAffineAnims_GustToTarget[] =
{ {
gUnknown_83E6B00, sAffineAnim_GustToTarget,
}; };
const struct SpriteTemplate gUnknown_83E6B1C = const struct SpriteTemplate gGustToTargetSpriteTemplate =
{ {
.tileTag = ANIM_TAG_GUST, .tileTag = ANIM_TAG_GUST,
.paletteTag = ANIM_TAG_GUST, .paletteTag = ANIM_TAG_GUST,
.oam = &gOamData_AffineNormal_ObjNormal_32x64, .oam = &gOamData_AffineNormal_ObjNormal_32x64,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E6B18, .affineAnims = sAffineAnims_GustToTarget,
.callback = sub_80B1A1C, .callback = AnimGustToTarget,
}; };
static const union AnimCmd gUnknown_83E6B34[] = static const union AnimCmd sAffineAnim_AirWaveCrescent[] =
{ {
ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(0, 3),
ANIMCMD_FRAME(0, 3, .hFlip = TRUE), ANIMCMD_FRAME(0, 3, .hFlip = TRUE),
@@ -78,23 +78,23 @@ static const union AnimCmd gUnknown_83E6B34[] =
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
static const union AnimCmd *const gUnknown_83E6B48[] = static const union AnimCmd *const sAffineAnims_AirWaveCrescent[] =
{ {
gUnknown_83E6B34, sAffineAnim_AirWaveCrescent,
}; };
const struct SpriteTemplate gUnknown_83E6B4C = const struct SpriteTemplate gAirWaveCrescentSpriteTemplate =
{ {
.tileTag = ANIM_TAG_AIR_WAVE_2, .tileTag = ANIM_TAG_AIR_WAVE_2,
.paletteTag = ANIM_TAG_AIR_WAVE_2, .paletteTag = ANIM_TAG_AIR_WAVE_2,
.oam = &gOamData_AffineOff_ObjNormal_32x16, .oam = &gOamData_AffineOff_ObjNormal_32x16,
.anims = gUnknown_83E6B48, .anims = sAffineAnims_AirWaveCrescent,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B1AB8, .callback = AnimAirWaveCrescent,
}; };
static const union AffineAnimCmd gUnknown_83E6B64[] = static const union AffineAnimCmd sAffineAnim_FlyBallUp[] =
{ {
AFFINEANIMCMD_FRAME(0x10, 0x100, 0, 0), AFFINEANIMCMD_FRAME(0x10, 0x100, 0, 0),
AFFINEANIMCMD_FRAME(0x28, 0x0, 0, 6), AFFINEANIMCMD_FRAME(0x28, 0x0, 0, 6),
@@ -103,78 +103,78 @@ static const union AffineAnimCmd gUnknown_83E6B64[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gUnknown_83E6B8C[] = static const union AffineAnimCmd *const sAffineAnims_FlyBallUp[] =
{ {
gUnknown_83E6B64, sAffineAnim_FlyBallUp,
}; };
static const union AffineAnimCmd gUnknown_83E6B90[] = static const union AffineAnimCmd sAffineAnim_FlyBallAttack_0[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, 50, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, 50, 1),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E6B9C[] = static const union AffineAnimCmd sAffineAnim_FlyBallAttack_1[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, -40, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, -40, 1),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gUnknown_83E6BB0[] = static const union AffineAnimCmd *const sAffineAnims_FlyBallAttack[] =
{ {
gUnknown_83E6B90, sAffineAnim_FlyBallAttack_0,
gUnknown_83E6B9C, sAffineAnim_FlyBallAttack_1,
}; };
const struct SpriteTemplate gUnknown_83E6BB8 = const struct SpriteTemplate gFlyBallUpSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ROUND_SHADOW, .tileTag = ANIM_TAG_ROUND_SHADOW,
.paletteTag = ANIM_TAG_ROUND_SHADOW, .paletteTag = ANIM_TAG_ROUND_SHADOW,
.oam = &gOamData_AffineDouble_ObjNormal_64x64, .oam = &gOamData_AffineDouble_ObjNormal_64x64,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E6B8C, .affineAnims = sAffineAnims_FlyBallUp,
.callback = sub_80B1BB0, .callback = AnimFlyBallUp,
}; };
const struct SpriteTemplate gUnknown_83E6BD0 = const struct SpriteTemplate gFlyBallAttackSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ROUND_SHADOW, .tileTag = ANIM_TAG_ROUND_SHADOW,
.paletteTag = ANIM_TAG_ROUND_SHADOW, .paletteTag = ANIM_TAG_ROUND_SHADOW,
.oam = &gOamData_AffineNormal_ObjNormal_64x64, .oam = &gOamData_AffineNormal_ObjNormal_64x64,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E6BB0, .affineAnims = sAffineAnims_FlyBallAttack,
.callback = sub_80B1C3C, .callback = AnimFlyBallAttack,
}; };
static const union AnimCmd gUnknown_83E6BE8[] = static const union AnimCmd sAnim_FallingFeather_0[] =
{ {
ANIMCMD_FRAME(0, 0), ANIMCMD_FRAME(0, 0),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E6BF0[] = static const union AnimCmd sAnim_FallingFeather_1[] =
{ {
ANIMCMD_FRAME(16, 0, .hFlip = TRUE), ANIMCMD_FRAME(16, 0, .hFlip = TRUE),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd *const gUnknown_83E6BF8[] = static const union AnimCmd *const sAnims_FallingFeather[] =
{ {
gUnknown_83E6BE8, sAnim_FallingFeather_0,
gUnknown_83E6BF0, sAnim_FallingFeather_1,
}; };
const struct SpriteTemplate gUnknown_83E6C00 = const struct SpriteTemplate gFallingFeatherSpriteTemplate =
{ {
.tileTag = ANIM_TAG_WHITE_FEATHER, .tileTag = ANIM_TAG_WHITE_FEATHER,
.paletteTag = ANIM_TAG_WHITE_FEATHER, .paletteTag = ANIM_TAG_WHITE_FEATHER,
.oam = &gOamData_AffineNormal_ObjNormal_32x32, .oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = gUnknown_83E6BF8, .anims = sAnims_FallingFeather,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B1D88, .callback = AnimFallingFeather,
}; };
// not used // not used
@@ -196,13 +196,13 @@ const struct SpriteTemplate gUnknown_83E6C50 =
.tileTag = ANIM_TAG_WHITE_FEATHER, .tileTag = ANIM_TAG_WHITE_FEATHER,
.paletteTag = ANIM_TAG_WHITE_FEATHER, .paletteTag = ANIM_TAG_WHITE_FEATHER,
.oam = &gOamData_AffineNormal_ObjNormal_32x32, .oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = gUnknown_83E6BF8, .anims = sAnims_FallingFeather,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B2514, .callback = sub_80B2514,
}; };
static const union AnimCmd gUnknown_83E6C68[] = static const union AnimCmd sAnim_WhirlwindLines[] =
{ {
ANIMCMD_FRAME(0, 1), ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(8, 1), ANIMCMD_FRAME(8, 1),
@@ -212,23 +212,23 @@ static const union AnimCmd gUnknown_83E6C68[] =
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd *const gUnknown_83E6C80[] = static const union AnimCmd *const sAnims_WhirlwindLines[] =
{ {
gUnknown_83E6C68, sAnim_WhirlwindLines,
}; };
const struct SpriteTemplate gUnknown_83E6C84 = const struct SpriteTemplate gWhirlwindLineSpriteTemplate =
{ {
.tileTag = ANIM_TAG_WHIRLWIND_LINES, .tileTag = ANIM_TAG_WHIRLWIND_LINES,
.paletteTag = ANIM_TAG_WHIRLWIND_LINES, .paletteTag = ANIM_TAG_WHIRLWIND_LINES,
.oam = &gOamData_AffineOff_ObjNormal_32x16, .oam = &gOamData_AffineOff_ObjNormal_32x16,
.anims = gUnknown_83E6C80, .anims = sAnims_WhirlwindLines,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B2780, .callback = AnimWhirlwindLine,
}; };
static const union AffineAnimCmd gUnknown_83E6C9C[] = static const union AffineAnimCmd sAffineAnim_BounceBallShrink[] =
{ {
AFFINEANIMCMD_FRAME(0x10, 0x100, 0, 0), AFFINEANIMCMD_FRAME(0x10, 0x100, 0, 0),
AFFINEANIMCMD_FRAME(0x28, 0x0, 0, 6), AFFINEANIMCMD_FRAME(0x28, 0x0, 0, 6),
@@ -238,45 +238,45 @@ static const union AffineAnimCmd gUnknown_83E6C9C[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gUnknown_83E6CCC[] = static const union AffineAnimCmd *const sAffineAnims_BounceBallShrink[] =
{ {
gUnknown_83E6C9C, sAffineAnim_BounceBallShrink,
}; };
const struct SpriteTemplate gUnknown_83E6CD0 = const struct SpriteTemplate gBounceBallShrinkSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ROUND_SHADOW, .tileTag = ANIM_TAG_ROUND_SHADOW,
.paletteTag = ANIM_TAG_ROUND_SHADOW, .paletteTag = ANIM_TAG_ROUND_SHADOW,
.oam = &gOamData_AffineDouble_ObjNormal_64x64, .oam = &gOamData_AffineDouble_ObjNormal_64x64,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E6CCC, .affineAnims = sAffineAnims_BounceBallShrink,
.callback = sub_80B2914, .callback = AnimBounceBallShrink,
}; };
static const union AffineAnimCmd gUnknown_83E6CE8[] = static const union AffineAnimCmd sAffineAnim_BounceBallLand[] =
{ {
AFFINEANIMCMD_FRAME(0xA0, 0x100, 0, 0), AFFINEANIMCMD_FRAME(0xA0, 0x100, 0, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gUnknown_83E6CF8[] = static const union AffineAnimCmd *const sAffineAnims_BounceBallLand[] =
{ {
gUnknown_83E6CE8, sAffineAnim_BounceBallLand,
}; };
const struct SpriteTemplate gUnknown_83E6CFC = const struct SpriteTemplate gBounceBallLandSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ROUND_SHADOW, .tileTag = ANIM_TAG_ROUND_SHADOW,
.paletteTag = ANIM_TAG_ROUND_SHADOW, .paletteTag = ANIM_TAG_ROUND_SHADOW,
.oam = &gOamData_AffineDouble_ObjNormal_64x64, .oam = &gOamData_AffineDouble_ObjNormal_64x64,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E6CF8, .affineAnims = sAffineAnims_BounceBallLand,
.callback = sub_80B2974, .callback = AnimBounceBallLand,
}; };
static const union AffineAnimCmd gUnknown_83E6D14[] = static const union AffineAnimCmd sAffineAnim_DiveBall[] =
{ {
AFFINEANIMCMD_FRAME(0x10, 0x100, 0, 0), AFFINEANIMCMD_FRAME(0x10, 0x100, 0, 0),
AFFINEANIMCMD_FRAME(0x28, 0x0, 0, 6), AFFINEANIMCMD_FRAME(0x28, 0x0, 0, 6),
@@ -285,20 +285,20 @@ static const union AffineAnimCmd gUnknown_83E6D14[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gUnknown_83E6D3C[] = static const union AffineAnimCmd *const sAffineAnims_DiveBall[] =
{ {
gUnknown_83E6D14, sAffineAnim_DiveBall,
}; };
const struct SpriteTemplate gUnknown_83E6D40 = const struct SpriteTemplate gDiveBallSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ROUND_SHADOW, .tileTag = ANIM_TAG_ROUND_SHADOW,
.paletteTag = ANIM_TAG_ROUND_SHADOW, .paletteTag = ANIM_TAG_ROUND_SHADOW,
.oam = &gOamData_AffineDouble_ObjNormal_64x64, .oam = &gOamData_AffineDouble_ObjNormal_64x64,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E6D3C, .affineAnims = sAffineAnims_DiveBall,
.callback = sub_80B2A08, .callback = AnimDiveBall,
}; };
// not used // not used
@@ -316,7 +316,7 @@ static const union AffineAnimCmd *const gUnknown_83E6D80[] =
gUnknown_83E6D58, gUnknown_83E6D58,
}; };
const struct SpriteTemplate gUnknown_83E6D7C = const struct SpriteTemplate gDiveWaterSplashSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SPLASH, .tileTag = ANIM_TAG_SPLASH,
.paletteTag = ANIM_TAG_SPLASH, .paletteTag = ANIM_TAG_SPLASH,
@@ -324,10 +324,10 @@ const struct SpriteTemplate gUnknown_83E6D7C =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B2AF4, .callback = AnimDiveWaterSplash,
}; };
const struct SpriteTemplate gUnknown_83E6D94 = const struct SpriteTemplate gSprayWaterDropletSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SWEAT_BEAD, .tileTag = ANIM_TAG_SWEAT_BEAD,
.paletteTag = ANIM_TAG_SWEAT_BEAD, .paletteTag = ANIM_TAG_SWEAT_BEAD,
@@ -335,7 +335,7 @@ const struct SpriteTemplate gUnknown_83E6D94 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B2BD8, .callback = AnimSprayWaterDroplet,
}; };
const struct SpriteTemplate gUnknown_83E6DAC = const struct SpriteTemplate gUnknown_83E6DAC =
@@ -349,7 +349,7 @@ const struct SpriteTemplate gUnknown_83E6DAC =
.callback = sub_80B2CE4, .callback = sub_80B2CE4,
}; };
const struct SpriteTemplate gUnknown_83E6DB4 = const struct SpriteTemplate gSkyAttackBirdSpriteTemplate =
{ {
.tileTag = ANIM_TAG_BIRD, .tileTag = ANIM_TAG_BIRD,
.paletteTag = ANIM_TAG_BIRD, .paletteTag = ANIM_TAG_BIRD,
@@ -357,10 +357,10 @@ const struct SpriteTemplate gUnknown_83E6DB4 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B2D64, .callback = AnimSkyAttackBird,
}; };
static void sub_80B18E4(struct Sprite *sprite) static void AnimEllipticalGust(struct Sprite *sprite)
{ {
InitSpritePosToAnimTarget(sprite, FALSE); InitSpritePosToAnimTarget(sprite, FALSE);
sprite->pos1.y += 20; sprite->pos1.y += 20;
@@ -379,7 +379,7 @@ static void sub_80B190C(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
void sub_80B194C(u8 taskId) void AnimTask_AnimateGustTornadoPalette(u8 taskId)
{ {
gTasks[taskId].data[0] = gBattleAnimArgs[1]; gTasks[taskId].data[0] = gBattleAnimArgs[1];
gTasks[taskId].data[1] = gBattleAnimArgs[0]; gTasks[taskId].data[1] = gBattleAnimArgs[0];
@@ -411,7 +411,7 @@ static void sub_80B198C(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
static void sub_80B1A1C(struct Sprite *sprite) static void AnimGustToTarget(struct Sprite *sprite)
{ {
InitSpritePosToAnimAttacker(sprite, TRUE); InitSpritePosToAnimAttacker(sprite, TRUE);
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
@@ -432,7 +432,7 @@ static void sub_80B1A9C(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
static void sub_80B1AB8(struct Sprite *sprite) static void AnimAirWaveCrescent(struct Sprite *sprite)
{ {
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
{ {
@@ -467,7 +467,7 @@ static void sub_80B1AB8(struct Sprite *sprite)
SeekSpriteAnim(sprite, gBattleAnimArgs[5]); SeekSpriteAnim(sprite, gBattleAnimArgs[5]);
} }
static void sub_80B1BB0(struct Sprite *sprite) static void AnimFlyBallUp(struct Sprite *sprite)
{ {
InitSpritePosToAnimAttacker(sprite, TRUE); InitSpritePosToAnimAttacker(sprite, TRUE);
sprite->data[0] = gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[2];
@@ -491,7 +491,7 @@ static void sub_80B1BF8(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
static void sub_80B1C3C(struct Sprite *sprite) static void AnimFlyBallAttack(struct Sprite *sprite)
{ {
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
{ {
@@ -564,7 +564,7 @@ struct FeatherDanceData
u16 unkE_1:15; u16 unkE_1:15;
}; };
static void sub_80B1D88(struct Sprite *sprite) static void AnimFallingFeather(struct Sprite *sprite)
{ {
u8 battler, matrixNum, sinIndex; u8 battler, matrixNum, sinIndex;
s16 spriteCoord, sinVal; s16 spriteCoord, sinVal;
@@ -986,7 +986,7 @@ static void sub_80B268C(struct Sprite *sprite)
sprite->callback = sub_80B1F94; sprite->callback = sub_80B1F94;
} }
static void sub_80B2780(struct Sprite *sprite) static void AnimWhirlwindLine(struct Sprite *sprite)
{ {
u16 arg; u16 arg;
u8 mult; u8 mult;
@@ -1023,7 +1023,7 @@ static void sub_80B2820(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
void sub_80B2868(u8 taskId) void AnimTask_DrillPeckHitSplats(u8 taskId)
{ {
if (!(gTasks[taskId].data[0] % 32)) if (!(gTasks[taskId].data[0] % 32))
{ {
@@ -1032,7 +1032,7 @@ void sub_80B2868(u8 taskId)
gBattleAnimArgs[1] = Cos(gTasks[taskId].data[0], -13); gBattleAnimArgs[1] = Cos(gTasks[taskId].data[0], -13);
gBattleAnimArgs[2] = 1; gBattleAnimArgs[2] = 1;
gBattleAnimArgs[3] = 3; gBattleAnimArgs[3] = 3;
CreateSpriteAndAnimate(&gUnknown_83E7C98, CreateSpriteAndAnimate(&gFlashingHitSplatSpriteTemplate,
GetBattlerSpriteCoord(gBattleAnimTarget, 2), GetBattlerSpriteCoord(gBattleAnimTarget, 2),
GetBattlerSpriteCoord(gBattleAnimTarget, 3), GetBattlerSpriteCoord(gBattleAnimTarget, 3),
3); 3);
@@ -1042,7 +1042,7 @@ void sub_80B2868(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
static void sub_80B2914(struct Sprite *sprite) static void AnimBounceBallShrink(struct Sprite *sprite)
{ {
switch (sprite->data[0]) switch (sprite->data[0])
{ {
@@ -1058,7 +1058,7 @@ static void sub_80B2914(struct Sprite *sprite)
} }
} }
static void sub_80B2974(struct Sprite *sprite) static void AnimBounceBallLand(struct Sprite *sprite)
{ {
switch (sprite->data[0]) switch (sprite->data[0])
{ {
@@ -1083,7 +1083,7 @@ static void sub_80B2974(struct Sprite *sprite)
} }
} }
static void sub_80B2A08(struct Sprite *sprite) static void AnimDiveBall(struct Sprite *sprite)
{ {
InitSpritePosToAnimAttacker(sprite, 1); InitSpritePosToAnimAttacker(sprite, 1);
sprite->data[0] = gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[2];
@@ -1120,7 +1120,7 @@ static void sub_80B2AB0(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
static void sub_80B2AF4(struct Sprite *sprite) static void AnimDiveWaterSplash(struct Sprite *sprite)
{ {
u32 matrixNum; u32 matrixNum;
s32 t1, t2; s32 t1, t2;
@@ -1165,7 +1165,7 @@ static void sub_80B2AF4(struct Sprite *sprite)
} }
} }
static void sub_80B2BD8(struct Sprite *sprite) static void AnimSprayWaterDroplet(struct Sprite *sprite)
{ {
s32 v1 = 0x1FF & Random(); s32 v1 = 0x1FF & Random();
s32 v2 = 0x7F & Random(); s32 v2 = 0x7F & Random();
@@ -1241,7 +1241,7 @@ static void sub_80B2CF8(struct Sprite *sprite)
} }
} }
static void sub_80B2D64(struct Sprite *sprite) static void AnimSkyAttackBird(struct Sprite *sprite)
{ {
u16 rotation; u16 rotation;
s16 posx = sprite->pos1.x; s16 posx = sprite->pos1.x;
src/ghost.c
+58 -58
View File
@@ -8,65 +8,65 @@
#include "decompress.h" #include "decompress.h"
#include "constants/songs.h" #include "constants/songs.h"
static void sub_80B5268(struct Sprite *sprite); static void AnimConfuseRayBallBounce(struct Sprite *sprite);
static void sub_80B52D0(struct Sprite *sprite); static void sub_80B52D0(struct Sprite *sprite);
static void sub_80B5344(struct Sprite *sprite); static void sub_80B5344(struct Sprite *sprite);
static void sub_80B53C0(struct Sprite *sprite); static void sub_80B53C0(struct Sprite *sprite);
static void sub_80B5450(struct Sprite *sprite); static void AnimConfuseRayBallSpiral(struct Sprite *sprite);
static void sub_80B5470(struct Sprite *sprite); static void sub_80B5470(struct Sprite *sprite);
static void sub_80B5570(u8 taskId); static void sub_80B5570(u8 taskId);
static void sub_80B55C8(u8 taskId); static void sub_80B55C8(u8 taskId);
static void InitAnimShadowBall(struct Sprite *sprite); static void AnimShadowBall(struct Sprite *sprite);
static void AnimShadowBallStep(struct Sprite *sprite); static void AnimShadowBallStep(struct Sprite *sprite);
static void sub_80B57F8(struct Sprite *sprite); static void AnimLick(struct Sprite *sprite);
static void sub_80B5810(struct Sprite *sprite); static void sub_80B5810(struct Sprite *sprite);
static void sub_80B59D4(u8 taskId); static void sub_80B59D4(u8 taskId);
static void sub_80B5AD4(u8 taskId); static void sub_80B5AD4(u8 taskId);
static void sub_80B5D38(u8 taskId); static void sub_80B5D38(u8 taskId);
static void sub_80B5DCC(u8 taskId); static void sub_80B5DCC(u8 taskId);
static void sub_80B5EC0(struct Sprite *sprite); static void AnimDestinyBondWhiteShadow(struct Sprite *sprite);
static void sub_80B5FE0(struct Sprite *sprite); static void sub_80B5FE0(struct Sprite *sprite);
static void sub_80B623C(u8 taskId); static void sub_80B623C(u8 taskId);
static void sub_80B6468(u8 taskId); static void sub_80B6468(u8 taskId);
static void sub_80B65F0(u8 taskId); static void sub_80B65F0(u8 taskId);
static void sub_80B664C(struct Sprite *sprite); static void AnimCurseNail(struct Sprite *sprite);
static void sub_80B66A8(struct Sprite *sprite); static void sub_80B66A8(struct Sprite *sprite);
static void sub_80B6728(struct Sprite *sprite); static void sub_80B6728(struct Sprite *sprite);
static void sub_80B67A0(struct Sprite *sprite); static void sub_80B67A0(struct Sprite *sprite);
static void sub_80B67D4(struct Sprite *sprite); static void AnimGhostStatusSprite(struct Sprite *sprite);
static void sub_80B68A8(struct Sprite *sprite); static void sub_80B68A8(struct Sprite *sprite);
static void sub_80B696C(u8 taskId); static void sub_80B696C(u8 taskId);
static void sub_80B6AF8(struct Sprite *sprite); static void AnimGrudgeFlame(struct Sprite *sprite);
static void sub_80B7158(struct Sprite *sprite); static void sub_80B7158(struct Sprite *sprite);
static void sub_80B6BE4(u8 taskId); static void sub_80B6BE4(u8 taskId);
static void sub_80B6F30(u8 taskId); static void sub_80B6F30(u8 taskId);
static void sub_80B6FC4(u8 taskId); static void sub_80B6FC4(u8 taskId);
static void sub_80B71B0(struct Sprite *sprite); static void sub_80B71B0(struct Sprite *sprite);
static const union AffineAnimCmd gUnknown_83E75A8[] = static const union AffineAnimCmd sAffineAnim_ConfuseRayBallBounce[] =
{ {
AFFINEANIMCMD_FRAME(0x1E, 0x1E, 10, 5), AFFINEANIMCMD_FRAME(0x1E, 0x1E, 10, 5),
AFFINEANIMCMD_FRAME(-0x1E, -0x1E, 10, 5), AFFINEANIMCMD_FRAME(-0x1E, -0x1E, 10, 5),
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
static const union AffineAnimCmd *const gUnknown_83E75C0[] = static const union AffineAnimCmd *const sAffineAnims_ConfuseRayBallBounce[] =
{ {
gUnknown_83E75A8, sAffineAnim_ConfuseRayBallBounce,
}; };
const struct SpriteTemplate gUnknown_83E75C4 = const struct SpriteTemplate gConfuseRayBallBounceSpriteTemplate =
{ {
.tileTag = ANIM_TAG_YELLOW_BALL, .tileTag = ANIM_TAG_YELLOW_BALL,
.paletteTag = ANIM_TAG_YELLOW_BALL, .paletteTag = ANIM_TAG_YELLOW_BALL,
.oam = &gOamData_AffineDouble_ObjNormal_16x16, .oam = &gOamData_AffineDouble_ObjNormal_16x16,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E75C0, .affineAnims = sAffineAnims_ConfuseRayBallBounce,
.callback = sub_80B5268, .callback = AnimConfuseRayBallBounce,
}; };
const struct SpriteTemplate gUnknown_83E75DC = const struct SpriteTemplate gConfuseRayBallSpiralSpriteTemplate =
{ {
.tileTag = ANIM_TAG_YELLOW_BALL, .tileTag = ANIM_TAG_YELLOW_BALL,
.paletteTag = ANIM_TAG_YELLOW_BALL, .paletteTag = ANIM_TAG_YELLOW_BALL,
@@ -74,18 +74,18 @@ const struct SpriteTemplate gUnknown_83E75DC =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B5450, .callback = AnimConfuseRayBallSpiral,
}; };
static const union AffineAnimCmd gUnknown_83E75F4[] = static const union AffineAnimCmd sAffineAnim_ShadowBall[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, 10, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, 10, 1),
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
static const union AffineAnimCmd *const gUnknown_83E7604[] = static const union AffineAnimCmd *const sAffineAnims_ShadowBall[] =
{ {
gUnknown_83E75F4, sAffineAnim_ShadowBall,
}; };
const struct SpriteTemplate gShadowBallSpriteTemplate = const struct SpriteTemplate gShadowBallSpriteTemplate =
@@ -95,11 +95,11 @@ const struct SpriteTemplate gShadowBallSpriteTemplate =
.oam = &gOamData_AffineNormal_ObjNormal_32x32, .oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E7604, .affineAnims = sAffineAnims_ShadowBall,
.callback = InitAnimShadowBall, .callback = AnimShadowBall,
}; };
const union AnimCmd gUnknown_83E7620[] = const union AnimCmd sAnim_Lick[] =
{ {
ANIMCMD_FRAME(0, 2), ANIMCMD_FRAME(0, 2),
ANIMCMD_FRAME(8, 2), ANIMCMD_FRAME(8, 2),
@@ -109,20 +109,20 @@ const union AnimCmd gUnknown_83E7620[] =
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd *const gUnknown_83E7638[] = static const union AnimCmd *const sAnims_Lick[] =
{ {
gUnknown_83E7620, sAnim_Lick,
}; };
const struct SpriteTemplate gUnknown_83E763C = const struct SpriteTemplate gLickSpriteTemplate =
{ {
.tileTag = ANIM_TAG_LICK, .tileTag = ANIM_TAG_LICK,
.paletteTag = ANIM_TAG_LICK, .paletteTag = ANIM_TAG_LICK,
.oam = &gOamData_AffineOff_ObjNormal_16x32, .oam = &gOamData_AffineOff_ObjNormal_16x32,
.anims = gUnknown_83E7638, .anims = sAnims_Lick,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B57F8, .callback = AnimLick,
}; };
// not used // not used
@@ -138,7 +138,7 @@ static const union AffineAnimCmd *const gUnknown_83E7664[] =
gUnknown_83E7654, gUnknown_83E7654,
}; };
const struct SpriteTemplate gUnknown_83E7668 = const struct SpriteTemplate gDestinyBondWhiteShadowSpriteTemplate =
{ {
.tileTag = ANIM_TAG_WHITE_SHADOW, .tileTag = ANIM_TAG_WHITE_SHADOW,
.paletteTag = ANIM_TAG_WHITE_SHADOW, .paletteTag = ANIM_TAG_WHITE_SHADOW,
@@ -146,10 +146,10 @@ const struct SpriteTemplate gUnknown_83E7668 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B5EC0, .callback = AnimDestinyBondWhiteShadow,
}; };
const struct SpriteTemplate gUnknown_83E7680 = const struct SpriteTemplate gCurseNailSpriteTemplate =
{ {
.tileTag = ANIM_TAG_NAIL, .tileTag = ANIM_TAG_NAIL,
.paletteTag = ANIM_TAG_NAIL, .paletteTag = ANIM_TAG_NAIL,
@@ -157,10 +157,10 @@ const struct SpriteTemplate gUnknown_83E7680 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B664C, .callback = AnimCurseNail,
}; };
const struct SpriteTemplate gUnknown_83E7698 = const struct SpriteTemplate gCurseGhostSpriteTemplate =
{ {
.tileTag = ANIM_TAG_GHOSTLY_SPIRIT, .tileTag = ANIM_TAG_GHOSTLY_SPIRIT,
.paletteTag = ANIM_TAG_GHOSTLY_SPIRIT, .paletteTag = ANIM_TAG_GHOSTLY_SPIRIT,
@@ -168,10 +168,10 @@ const struct SpriteTemplate gUnknown_83E7698 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B67D4, .callback = AnimGhostStatusSprite,
}; };
const struct SpriteTemplate gUnknown_83E76B0 = const struct SpriteTemplate gNightmareDevilSpriteTemplate =
{ {
.tileTag = ANIM_TAG_DEVIL, .tileTag = ANIM_TAG_DEVIL,
.paletteTag = ANIM_TAG_DEVIL, .paletteTag = ANIM_TAG_DEVIL,
@@ -179,10 +179,10 @@ const struct SpriteTemplate gUnknown_83E76B0 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B67D4, .callback = AnimGhostStatusSprite,
}; };
static const union AnimCmd gUnknown_83E76C8[] = static const union AnimCmd sAnim_GrudgeFlame[] =
{ {
ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(0, 4),
ANIMCMD_FRAME(8, 4), ANIMCMD_FRAME(8, 4),
@@ -191,20 +191,20 @@ static const union AnimCmd gUnknown_83E76C8[] =
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
static const union AnimCmd *const gUnknown_83E76DC[] = static const union AnimCmd *const sAnims_GrudgeFlame[] =
{ {
gUnknown_83E76C8, sAnim_GrudgeFlame,
}; };
const struct SpriteTemplate gUnknown_83E76E0 = const struct SpriteTemplate gGrudgeFlameSpriteTemplate =
{ {
.tileTag = ANIM_TAG_PURPLE_FLAME, .tileTag = ANIM_TAG_PURPLE_FLAME,
.paletteTag = ANIM_TAG_PURPLE_FLAME, .paletteTag = ANIM_TAG_PURPLE_FLAME,
.oam = &gOamData_AffineOff_ObjBlend_16x32, .oam = &gOamData_AffineOff_ObjBlend_16x32,
.anims = gUnknown_83E76DC, .anims = sAnims_GrudgeFlame,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B6AF8, .callback = AnimGrudgeFlame,
}; };
const struct SpriteTemplate gUnknown_83E76F8 = const struct SpriteTemplate gUnknown_83E76F8 =
@@ -218,7 +218,7 @@ const struct SpriteTemplate gUnknown_83E76F8 =
.callback = sub_80B7158, .callback = sub_80B7158,
}; };
static void sub_80B5268(struct Sprite *sprite) static void AnimConfuseRayBallBounce(struct Sprite *sprite)
{ {
InitSpritePosToAnimAttacker(sprite, 1); InitSpritePosToAnimAttacker(sprite, 1);
sprite->data[0] = gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[2];
@@ -306,7 +306,7 @@ static void sub_80B53C0(struct Sprite *sprite)
} }
} }
static void sub_80B5450(struct Sprite *sprite) static void AnimConfuseRayBallSpiral(struct Sprite *sprite)
{ {
InitSpritePosToAnimTarget(sprite, TRUE); InitSpritePosToAnimTarget(sprite, TRUE);
sprite->callback = sub_80B5470; sprite->callback = sub_80B5470;
@@ -332,7 +332,7 @@ static void sub_80B5470(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
void sub_80B54E8(u8 taskId) void AnimTask_NightShadeClone(u8 taskId)
{ {
u8 spriteId; u8 spriteId;
@@ -393,7 +393,7 @@ static void sub_80B55C8(u8 taskId)
// arg 0: duration step 1 (attacker -> center) // arg 0: duration step 1 (attacker -> center)
// arg 1: duration step 2 (spin center) // arg 1: duration step 2 (spin center)
// arg 2: duration step 3 (center -> target) // arg 2: duration step 3 (center -> target)
static void InitAnimShadowBall(struct Sprite *sprite) static void AnimShadowBall(struct Sprite *sprite)
{ {
s16 oldPosX = sprite->pos1.x; s16 oldPosX = sprite->pos1.x;
s16 oldPosY = sprite->pos1.y; s16 oldPosY = sprite->pos1.y;
@@ -455,7 +455,7 @@ static void AnimShadowBallStep(struct Sprite *sprite)
} }
} }
static void sub_80B57F8(struct Sprite *sprite) static void AnimLick(struct Sprite *sprite)
{ {
InitSpritePosToAnimTarget(sprite, TRUE); InitSpritePosToAnimTarget(sprite, TRUE);
sprite->callback = sub_80B5810; sprite->callback = sub_80B5810;
@@ -507,7 +507,7 @@ static void sub_80B5810(struct Sprite *sprite)
} }
} }
void sub_80B58AC(u8 taskId) void AnimTask_NightmareClone(u8 taskId)
{ {
struct Task *task; struct Task *task;
@@ -579,7 +579,7 @@ static void sub_80B59D4(u8 taskId)
} }
} }
void sub_80B5AAC(u8 taskId) void AnimTask_SpiteTargetShadow(u8 taskId)
{ {
struct Task *task; struct Task *task;
@@ -732,7 +732,7 @@ static void sub_80B5DCC(u8 taskId)
++task->data[15]; ++task->data[15];
} }
static void sub_80B5EC0(struct Sprite *sprite) static void AnimDestinyBondWhiteShadow(struct Sprite *sprite)
{ {
s16 battler1X, battler1Y; s16 battler1X, battler1Y;
s16 battler2X, battler2Y; s16 battler2X, battler2Y;
@@ -781,7 +781,7 @@ static void sub_80B5FE0(struct Sprite *sprite)
} }
} }
void sub_80B6020(u8 taskId) void AnimTask_DestinyBondWhiteShadow(u8 taskId)
{ {
struct Task *task; struct Task *task;
s16 battler; s16 battler;
@@ -808,7 +808,7 @@ void sub_80B6020(u8 taskId)
&& battler != (gBattleAnimAttacker ^ 2) && battler != (gBattleAnimAttacker ^ 2)
&& IsBattlerSpriteVisible(battler)) && IsBattlerSpriteVisible(battler))
{ {
spriteId = CreateSprite(&gUnknown_83E7668, baseX, baseY, 55); spriteId = CreateSprite(&gDestinyBondWhiteShadowSpriteTemplate, baseX, baseY, 55);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
x = GetBattlerSpriteCoord(battler, 2); x = GetBattlerSpriteCoord(battler, 2);
@@ -829,7 +829,7 @@ void sub_80B6020(u8 taskId)
} }
else else
{ {
spriteId = CreateSprite(&gUnknown_83E7668, baseX, baseY, 55); spriteId = CreateSprite(&gDestinyBondWhiteShadowSpriteTemplate, baseX, baseY, 55);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
x = 48; x = 48;
@@ -921,7 +921,7 @@ static void sub_80B623C(u8 taskId)
} }
} }
void sub_80B63B4(u8 taskId) void AnimTask_CurseStretchingBlackBg(u8 taskId)
{ {
s16 startX, startY; s16 startX, startY;
s16 leftDistance, topDistance, bottomDistance, rightDistance; s16 leftDistance, topDistance, bottomDistance, rightDistance;
@@ -1004,7 +1004,7 @@ static void sub_80B65F0(u8 taskId)
} }
} }
static void sub_80B664C(struct Sprite *sprite) static void AnimCurseNail(struct Sprite *sprite)
{ {
s16 xDelta, xDelta2; s16 xDelta, xDelta2;
@@ -1093,7 +1093,7 @@ static void sub_80B67A0(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
static void sub_80B67D4(struct Sprite *sprite) static void AnimGhostStatusSprite(struct Sprite *sprite)
{ {
u16 coeffB, coeffA; u16 coeffB, coeffA;
@@ -1137,7 +1137,7 @@ static void sub_80B68A8(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
void sub_80B68C8(u8 taskId) void AnimTask_GrudgeFlames(u8 taskId)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
@@ -1168,7 +1168,7 @@ static void sub_80B696C(u8 taskId)
case 0: case 0:
for (i = 0; i < 6; ++i) for (i = 0; i < 6; ++i)
{ {
spriteId = CreateSprite(&gUnknown_83E76E0, task->data[9], task->data[10], task->data[6]); spriteId = CreateSprite(&gGrudgeFlameSpriteTemplate, task->data[9], task->data[10], task->data[6]);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
gSprites[spriteId].data[0] = taskId; gSprites[spriteId].data[0] = taskId;
@@ -1235,7 +1235,7 @@ static void sub_80B696C(u8 taskId)
} }
} }
static void sub_80B6AF8(struct Sprite *sprite) static void AnimGrudgeFlame(struct Sprite *sprite)
{ {
u16 index; u16 index;
src/ground.c
+22 -22
View File
@@ -26,51 +26,51 @@ static void sub_80B967C(u8 taskId);
static void sub_80B9760(struct Task *task); static void sub_80B9760(struct Task *task);
static void sub_80B98A8(u8 taskId); static void sub_80B98A8(u8 taskId);
static const union AffineAnimCmd gUnknown_83E7A00[] = static const union AffineAnimCmd sAffineAnim_Bonemerang[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, 15, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, 15, 1),
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
static const union AffineAnimCmd gUnknown_83E7A10[] = static const union AffineAnimCmd sAffineAnim_SpinningBone[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, 20, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, 20, 1),
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
static const union AffineAnimCmd *const gUnknown_83E7A20[] = static const union AffineAnimCmd *const sAffineAnims_Bonemerang[] =
{ {
gUnknown_83E7A00, sAffineAnim_Bonemerang,
}; };
static const union AffineAnimCmd *const gUnknown_83E7A24[] = static const union AffineAnimCmd *const sAffineAnims_SpinningBone[] =
{ {
gUnknown_83E7A10, sAffineAnim_SpinningBone,
}; };
const struct SpriteTemplate gUnknown_83E7A28 = const struct SpriteTemplate gBonemerangSpriteTemplate =
{ {
.tileTag = ANIM_TAG_BONE, .tileTag = ANIM_TAG_BONE,
.paletteTag = ANIM_TAG_BONE, .paletteTag = ANIM_TAG_BONE,
.oam = &gOamData_AffineNormal_ObjNormal_32x32, .oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E7A20, .affineAnims = sAffineAnims_Bonemerang,
.callback = AnimBonemerangProjectile, .callback = AnimBonemerangProjectile,
}; };
const struct SpriteTemplate gUnknown_83E7A40 = const struct SpriteTemplate gSpinningBoneSpriteTemplate =
{ {
.tileTag = ANIM_TAG_BONE, .tileTag = ANIM_TAG_BONE,
.paletteTag = ANIM_TAG_BONE, .paletteTag = ANIM_TAG_BONE,
.oam = &gOamData_AffineNormal_ObjNormal_32x32, .oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E7A24, .affineAnims = sAffineAnims_SpinningBone,
.callback = AnimBoneHitProjectile, .callback = AnimBoneHitProjectile,
}; };
const struct SpriteTemplate gUnknown_83E7A58 = const struct SpriteTemplate gSandAttackDirtSpriteTemplate =
{ {
.tileTag = ANIM_TAG_MUD_SAND, .tileTag = ANIM_TAG_MUD_SAND,
.paletteTag = ANIM_TAG_MUD_SAND, .paletteTag = ANIM_TAG_MUD_SAND,
@@ -81,29 +81,29 @@ const struct SpriteTemplate gUnknown_83E7A58 =
.callback = AnimDirtScatter, .callback = AnimDirtScatter,
}; };
static const union AnimCmd gUnknown_83E7A70[] = static const union AnimCmd sAnim_MudSlapMud[] =
{ {
ANIMCMD_FRAME(1, 1), ANIMCMD_FRAME(1, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd *const gUnknown_83E7A78[] = static const union AnimCmd *const sAnims_MudSlapMud[] =
{ {
gUnknown_83E7A70, sAnim_MudSlapMud,
}; };
const struct SpriteTemplate gUnknown_83E7A7C = const struct SpriteTemplate gMudSlapMudSpriteTemplate =
{ {
.tileTag = ANIM_TAG_MUD_SAND, .tileTag = ANIM_TAG_MUD_SAND,
.paletteTag = ANIM_TAG_MUD_SAND, .paletteTag = ANIM_TAG_MUD_SAND,
.oam = &gOamData_AffineOff_ObjNormal_16x16, .oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gUnknown_83E7A78, .anims = sAnims_MudSlapMud,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimDirtScatter, .callback = AnimDirtScatter,
}; };
const struct SpriteTemplate gUnknown_83E7A94 = const struct SpriteTemplate gMudsportMudSpriteTemplate =
{ {
.tileTag = ANIM_TAG_MUD_SAND, .tileTag = ANIM_TAG_MUD_SAND,
.paletteTag = ANIM_TAG_MUD_SAND, .paletteTag = ANIM_TAG_MUD_SAND,
@@ -114,7 +114,7 @@ const struct SpriteTemplate gUnknown_83E7A94 =
.callback = AnimMudSportDirt, .callback = AnimMudSportDirt,
}; };
const struct SpriteTemplate gUnknown_83E7AAC = const struct SpriteTemplate gDirtPlumeSpriteTemplate =
{ {
.tileTag = ANIM_TAG_MUD_SAND, .tileTag = ANIM_TAG_MUD_SAND,
.paletteTag = ANIM_TAG_MUD_SAND, .paletteTag = ANIM_TAG_MUD_SAND,
@@ -125,7 +125,7 @@ const struct SpriteTemplate gUnknown_83E7AAC =
.callback = AnimFissureDirtPlumeParticle, .callback = AnimFissureDirtPlumeParticle,
}; };
const struct SpriteTemplate gUnknown_83E7AC4 = const struct SpriteTemplate gDirtMoundSpriteTemplate =
{ {
.tileTag = ANIM_TAG_DIRT_MOUND, .tileTag = ANIM_TAG_DIRT_MOUND,
.paletteTag = ANIM_TAG_DIRT_MOUND, .paletteTag = ANIM_TAG_DIRT_MOUND,
@@ -279,7 +279,7 @@ static void AnimMudSportDirtFalling(struct Sprite *sprite)
} }
} }
void sub_80B8E94(u8 taskId) void AnimTask_DigDownMovement(u8 taskId)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
@@ -372,7 +372,7 @@ static void sub_80B908C(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_80B90EC(u8 taskId) void AnimTask_DigUpMovement(u8 taskId)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
@@ -689,7 +689,7 @@ void AnimTask_IsPowerOver99(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_80B9800(u8 taskId) void AnimTask_PositionFissureBgOnBattler(u8 taskId)
{ {
struct Task *newTask; struct Task *newTask;
u8 battler = (gBattleAnimArgs[0] & 1) ? gBattleAnimTarget : gBattleAnimAttacker; u8 battler = (gBattleAnimArgs[0] & 1) ? gBattleAnimTarget : gBattleAnimAttacker;
src/ice.c
+105 -104
View File
@@ -74,134 +74,135 @@ static const union AnimCmd gUnknown_83E62E8[] =
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E62F0[] = static const union AnimCmd sAnim_IceCrystalLarge[] =
{ {
ANIMCMD_FRAME(4, 1), ANIMCMD_FRAME(4, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E62F8[] = static const union AnimCmd sAnim_IceCrystalSmall[] =
{ {
ANIMCMD_FRAME(6, 1), ANIMCMD_FRAME(6, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E6300[] = static const union AnimCmd sAnim_Snowball[] =
{ {
ANIMCMD_FRAME(7, 1), ANIMCMD_FRAME(7, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E6308[] = static const union AnimCmd sAnim_BlizzardIceCrystal[] =
{ {
ANIMCMD_FRAME(8, 1), ANIMCMD_FRAME(8, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E6310[] = static const union AnimCmd sAnim_SmallBubblePair[] =
{ {
ANIMCMD_FRAME(12, 6), ANIMCMD_FRAME(12, 6),
ANIMCMD_FRAME(13, 6), ANIMCMD_FRAME(13, 6),
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
// unused
static const union AnimCmd *const gUnknown_83E631C[] = static const union AnimCmd *const gUnknown_83E631C[] =
{ {
gUnknown_83E62E8, gUnknown_83E62E8,
}; };
static const union AnimCmd *const gUnknown_83E6320[] = static const union AnimCmd *const sAnims_IceCrystalLarge[] =
{ {
gUnknown_83E62F0, sAnim_IceCrystalLarge,
}; };
static const union AnimCmd *const gUnknown_83E6324[] = static const union AnimCmd *const sAnims_IceCrystalSmall[] =
{ {
gUnknown_83E62F8, sAnim_IceCrystalSmall,
}; };
static const union AnimCmd *const gUnknown_83E6328[] = static const union AnimCmd *const sAnims_Snowball[] =
{ {
gUnknown_83E6300, sAnim_Snowball,
}; };
static const union AnimCmd *const gUnknown_83E632C[] = static const union AnimCmd *const sAnims_BlizzardIceCrystal[] =
{ {
gUnknown_83E6308, sAnim_BlizzardIceCrystal,
}; };
const union AnimCmd *const gAnims_SmallBubblePair[] = const union AnimCmd *const gAnims_SmallBubblePair[] =
{ {
gUnknown_83E6310, sAnim_SmallBubblePair,
}; };
static const union AffineAnimCmd gUnknown_83E6334[] = static const union AffineAnimCmd sAffineAnim_IceCrystalSpiralInwardLarge[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, 40, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, 40, 1),
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
static const union AffineAnimCmd *const gUnknown_83E6344[] = static const union AffineAnimCmd *const sAffineAnims_IceCrystalSpiralInwardLarge[] =
{ {
gUnknown_83E6334, sAffineAnim_IceCrystalSpiralInwardLarge,
}; };
const struct SpriteTemplate gUnknown_83E6348 = const struct SpriteTemplate gIceCrystalSpiralInwardLarge =
{ {
.tileTag = ANIM_TAG_ICE_CRYSTALS, .tileTag = ANIM_TAG_ICE_CRYSTALS,
.paletteTag = ANIM_TAG_ICE_CRYSTALS, .paletteTag = ANIM_TAG_ICE_CRYSTALS,
.oam = &gOamData_AffineDouble_ObjBlend_8x16, .oam = &gOamData_AffineDouble_ObjBlend_8x16,
.anims = gUnknown_83E6320, .anims = sAnims_IceCrystalLarge,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E6344, .affineAnims = sAffineAnims_IceCrystalSpiralInwardLarge,
.callback = AnimIcePunchSwirlingParticle, .callback = AnimIcePunchSwirlingParticle,
}; };
const struct SpriteTemplate gUnknown_83E6360 = const struct SpriteTemplate gIceCrystalSpiralInwardSmall =
{ {
.tileTag = ANIM_TAG_ICE_CRYSTALS, .tileTag = ANIM_TAG_ICE_CRYSTALS,
.paletteTag = ANIM_TAG_ICE_CRYSTALS, .paletteTag = ANIM_TAG_ICE_CRYSTALS,
.oam = &gOamData_AffineOff_ObjBlend_8x8, .oam = &gOamData_AffineOff_ObjBlend_8x8,
.anims = gUnknown_83E6324, .anims = sAnims_IceCrystalSmall,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimIcePunchSwirlingParticle, .callback = AnimIcePunchSwirlingParticle,
}; };
static const union AffineAnimCmd gUnknown_83E6378[] = static const union AffineAnimCmd sAffineAnim_IceBeamInnerCrystal[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, 10, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, 10, 1),
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
static const union AffineAnimCmd *const gUnknown_83E6388[] = static const union AffineAnimCmd *const sAffineAnims_IceBeamInnerCrystal[] =
{ {
gUnknown_83E6378, sAffineAnim_IceBeamInnerCrystal,
}; };
const struct SpriteTemplate gUnknown_83E638C = const struct SpriteTemplate gIceBeamInnerCrystalSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ICE_CRYSTALS, .tileTag = ANIM_TAG_ICE_CRYSTALS,
.paletteTag = ANIM_TAG_ICE_CRYSTALS, .paletteTag = ANIM_TAG_ICE_CRYSTALS,
.oam = &gOamData_AffineNormal_ObjBlend_8x16, .oam = &gOamData_AffineNormal_ObjBlend_8x16,
.anims = gUnknown_83E6320, .anims = sAnims_IceCrystalLarge,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E6388, .affineAnims = sAffineAnims_IceBeamInnerCrystal,
.callback = AnimIceBeamParticle, .callback = AnimIceBeamParticle,
}; };
const struct SpriteTemplate gUnknown_83E63A4 = const struct SpriteTemplate gIceBeamOuterCrystalSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ICE_CRYSTALS, .tileTag = ANIM_TAG_ICE_CRYSTALS,
.paletteTag = ANIM_TAG_ICE_CRYSTALS, .paletteTag = ANIM_TAG_ICE_CRYSTALS,
.oam = &gOamData_AffineOff_ObjBlend_8x8, .oam = &gOamData_AffineOff_ObjBlend_8x8,
.anims = gUnknown_83E6324, .anims = sAnims_IceCrystalSmall,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimIceBeamParticle, .callback = AnimIceBeamParticle,
}; };
static const union AffineAnimCmd gUnknown_83E63BC[] = static const union AffineAnimCmd sAffineAnim_IceCrystalHit[] =
{ {
AFFINEANIMCMD_FRAME(0xCE, 0xCE, 0, 0), AFFINEANIMCMD_FRAME(0xCE, 0xCE, 0, 0),
AFFINEANIMCMD_FRAME(0x5, 0x5, 0, 10), AFFINEANIMCMD_FRAME(0x5, 0x5, 0, 10),
@@ -209,67 +210,67 @@ static const union AffineAnimCmd gUnknown_83E63BC[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gUnknown_83E63DC[] = static const union AffineAnimCmd *const sAffineAnims_IceCrystalHit[] =
{ {
gUnknown_83E63BC, sAffineAnim_IceCrystalHit,
}; };
const struct SpriteTemplate gUnknown_83E63E0 = const struct SpriteTemplate gIceCrystalHitLargeSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ICE_CRYSTALS, .tileTag = ANIM_TAG_ICE_CRYSTALS,
.paletteTag = ANIM_TAG_ICE_CRYSTALS, .paletteTag = ANIM_TAG_ICE_CRYSTALS,
.oam = &gOamData_AffineNormal_ObjBlend_8x16, .oam = &gOamData_AffineNormal_ObjBlend_8x16,
.anims = gUnknown_83E6320, .anims = sAnims_IceCrystalLarge,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E63DC, .affineAnims = sAffineAnims_IceCrystalHit,
.callback = AnimIceEffectParticle, .callback = AnimIceEffectParticle,
}; };
const struct SpriteTemplate gUnknown_83E63F8 = const struct SpriteTemplate gIceCrystalHitSmallSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ICE_CRYSTALS, .tileTag = ANIM_TAG_ICE_CRYSTALS,
.paletteTag = ANIM_TAG_ICE_CRYSTALS, .paletteTag = ANIM_TAG_ICE_CRYSTALS,
.oam = &gOamData_AffineNormal_ObjBlend_8x8, .oam = &gOamData_AffineNormal_ObjBlend_8x8,
.anims = gUnknown_83E6324, .anims = sAnims_IceCrystalSmall,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E63DC, .affineAnims = sAffineAnims_IceCrystalHit,
.callback = AnimIceEffectParticle, .callback = AnimIceEffectParticle,
}; };
const struct SpriteTemplate gUnknown_83E6410 = const struct SpriteTemplate gSwirlingSnowballSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ICE_CRYSTALS, .tileTag = ANIM_TAG_ICE_CRYSTALS,
.paletteTag = ANIM_TAG_ICE_CRYSTALS, .paletteTag = ANIM_TAG_ICE_CRYSTALS,
.oam = &gOamData_AffineOff_ObjNormal_8x8, .oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gUnknown_83E6328, .anims = sAnims_Snowball,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimSwirlingSnowball_Step1, .callback = AnimSwirlingSnowball_Step1,
}; };
const struct SpriteTemplate gUnknown_83E6428 = const struct SpriteTemplate gBlizzardIceCrystalSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ICE_CRYSTALS, .tileTag = ANIM_TAG_ICE_CRYSTALS,
.paletteTag = ANIM_TAG_ICE_CRYSTALS, .paletteTag = ANIM_TAG_ICE_CRYSTALS,
.oam = &gOamData_AffineOff_ObjNormal_16x16, .oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gUnknown_83E632C, .anims = sAnims_BlizzardIceCrystal,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimMoveParticleBeyondTarget, .callback = AnimMoveParticleBeyondTarget,
}; };
const struct SpriteTemplate gUnknown_83E6440 = const struct SpriteTemplate gPowderSnowSnowballSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ICE_CRYSTALS, .tileTag = ANIM_TAG_ICE_CRYSTALS,
.paletteTag = ANIM_TAG_ICE_CRYSTALS, .paletteTag = ANIM_TAG_ICE_CRYSTALS,
.oam = &gOamData_AffineOff_ObjNormal_8x8, .oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gUnknown_83E6328, .anims = sAnims_Snowball,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimMoveParticleBeyondTarget, .callback = AnimMoveParticleBeyondTarget,
}; };
static const union AnimCmd gUnknown_83E6458[] = static const union AnimCmd sAnim_IceGroundSpike[] =
{ {
ANIMCMD_FRAME(0, 5), ANIMCMD_FRAME(0, 5),
ANIMCMD_FRAME(2, 5), ANIMCMD_FRAME(2, 5),
@@ -281,51 +282,51 @@ static const union AnimCmd gUnknown_83E6458[] =
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd *const gUnknown_83E6478[] = static const union AnimCmd *const sAnims_IceGroundSpike[] =
{ {
gUnknown_83E6458, sAnim_IceGroundSpike,
}; };
const struct SpriteTemplate gUnknown_83E647C = const struct SpriteTemplate gIceGroundSpikeSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ICE_SPIKES, .tileTag = ANIM_TAG_ICE_SPIKES,
.paletteTag = ANIM_TAG_ICE_SPIKES, .paletteTag = ANIM_TAG_ICE_SPIKES,
.oam = &gOamData_AffineOff_ObjBlend_8x16, .oam = &gOamData_AffineOff_ObjBlend_8x16,
.anims = gUnknown_83E6478, .anims = sAnims_IceGroundSpike,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimWaveFromCenterOfTarget, .callback = AnimWaveFromCenterOfTarget,
}; };
static const union AnimCmd gUnknown_83E6494[] = static const union AnimCmd sAnim_Cloud[] =
{ {
ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(0, 8),
ANIMCMD_FRAME(8, 8), ANIMCMD_FRAME(8, 8),
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
static const union AnimCmd *const gUnknown_83E64A0[] = static const union AnimCmd *const sAnims_Cloud[] =
{ {
gUnknown_83E6494, sAnim_Cloud,
}; };
const struct SpriteTemplate gUnknown_83E64A4 = const struct SpriteTemplate gMistCloudSpriteTemplate =
{ {
.tileTag = ANIM_TAG_MIST_CLOUD, .tileTag = ANIM_TAG_MIST_CLOUD,
.paletteTag = ANIM_TAG_MIST_CLOUD, .paletteTag = ANIM_TAG_MIST_CLOUD,
.oam = &gOamData_AffineOff_ObjBlend_32x16, .oam = &gOamData_AffineOff_ObjBlend_32x16,
.anims = gUnknown_83E64A0, .anims = sAnims_Cloud,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = InitSwirlingFogAnim, .callback = InitSwirlingFogAnim,
}; };
const struct SpriteTemplate gUnknown_83E64BC = const struct SpriteTemplate gSmogCloudSpriteTemplate =
{ {
.tileTag = ANIM_TAG_PURPLE_GAS_CLOUD, .tileTag = ANIM_TAG_PURPLE_GAS_CLOUD,
.paletteTag = ANIM_TAG_PURPLE_GAS_CLOUD, .paletteTag = ANIM_TAG_PURPLE_GAS_CLOUD,
.oam = &gOamData_AffineOff_ObjBlend_32x16, .oam = &gOamData_AffineOff_ObjBlend_32x16,
.anims = gUnknown_83E64A0, .anims = sAnims_Cloud,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = InitSwirlingFogAnim, .callback = InitSwirlingFogAnim,
@@ -336,7 +337,7 @@ static const u8 gUnknown_83E64D4[] =
0, 1, 2, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 6, 7, 8, 8, 8, 9, 0, 1, 2, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 6, 7, 8, 8, 8, 9,
}; };
const struct SpriteTemplate gUnknown_83E64E8 = const struct SpriteTemplate gMistBallSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SMALL_BUBBLES, .tileTag = ANIM_TAG_SMALL_BUBBLES,
.paletteTag = ANIM_TAG_SMALL_BUBBLES, .paletteTag = ANIM_TAG_SMALL_BUBBLES,
@@ -352,18 +353,18 @@ static const u8 gUnknown_83E6500[] =
0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5,
}; };
const struct SpriteTemplate gUnknown_83E6514 = const struct SpriteTemplate gPoisonGasCloudSpriteTemplate =
{ {
.tileTag = ANIM_TAG_PURPLE_GAS_CLOUD, .tileTag = ANIM_TAG_PURPLE_GAS_CLOUD,
.paletteTag = ANIM_TAG_PURPLE_GAS_CLOUD, .paletteTag = ANIM_TAG_PURPLE_GAS_CLOUD,
.oam = &gOamData_AffineOff_ObjBlend_32x16, .oam = &gOamData_AffineOff_ObjBlend_32x16,
.anims = gUnknown_83E64A0, .anims = sAnims_Cloud,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = InitPoisonGasCloudAnim, .callback = InitPoisonGasCloudAnim,
}; };
static const struct HailStruct gUnknown_83E652C[] = static const struct HailStruct sHailCoordData[] =
{ {
{100, 120, 0, 2}, {100, 120, 0, 2},
{85, 120, 0, 0}, {85, 120, 0, 0},
@@ -377,71 +378,71 @@ static const struct HailStruct gUnknown_83E652C[] =
{38, 120, 2, 0}, {38, 120, 2, 0},
}; };
static const union AffineAnimCmd gUnknown_83E6554[] = static const union AffineAnimCmd sAffineAnim_HailParticle_0[] =
{ {
AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0), AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E6564[] = static const union AffineAnimCmd sAffineAnim_HailParticle_1[] =
{ {
AFFINEANIMCMD_FRAME(0xF0, 0xF0, 0, 0), AFFINEANIMCMD_FRAME(0xF0, 0xF0, 0, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E6574[] = static const union AffineAnimCmd sAffineAnim_HailParticle_2[] =
{ {
AFFINEANIMCMD_FRAME(0xE0, 0xE0, 0, 0), AFFINEANIMCMD_FRAME(0xE0, 0xE0, 0, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E6584[] = static const union AffineAnimCmd sAffineAnim_WeatherBallIceDown[] =
{ {
AFFINEANIMCMD_FRAME(0x150, 0x150, 0, 0), AFFINEANIMCMD_FRAME(0x150, 0x150, 0, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gUnknown_83E6594[] = static const union AffineAnimCmd *const sAffineAnims_HailParticle[] =
{ {
gUnknown_83E6554, sAffineAnim_HailParticle_0,
gUnknown_83E6564, sAffineAnim_HailParticle_1,
gUnknown_83E6574, sAffineAnim_HailParticle_2,
}; };
static const union AffineAnimCmd *const gUnknown_83E65A0[] = static const union AffineAnimCmd *const sAffineAnims_WeatherBallIceDown[] =
{ {
gUnknown_83E6584, sAffineAnim_WeatherBallIceDown,
}; };
static const struct SpriteTemplate gUnknown_83E65A4 = static const struct SpriteTemplate sHailParticleSpriteTemplate =
{ {
.tileTag = ANIM_TAG_HAIL, .tileTag = ANIM_TAG_HAIL,
.paletteTag = ANIM_TAG_HAIL, .paletteTag = ANIM_TAG_HAIL,
.oam = &gOamData_AffineNormal_ObjNormal_16x16, .oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E6594, .affineAnims = sAffineAnims_HailParticle,
.callback = AnimHailBegin, .callback = AnimHailBegin,
}; };
const struct SpriteTemplate gUnknown_83E65BC = const struct SpriteTemplate gWeatherBallIceDownSpriteTemplate =
{ {
.tileTag = ANIM_TAG_HAIL, .tileTag = ANIM_TAG_HAIL,
.paletteTag = ANIM_TAG_HAIL, .paletteTag = ANIM_TAG_HAIL,
.oam = &gOamData_AffineNormal_ObjNormal_16x16, .oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E65A0, .affineAnims = sAffineAnims_WeatherBallIceDown,
.callback = AnimWeatherBallDown, .callback = AnimWeatherBallDown,
}; };
static const union AnimCmd gUnknown_83E65D4[] = static const union AnimCmd sAnim_IceBallChunk_0[] =
{ {
ANIMCMD_FRAME(0, 1), ANIMCMD_FRAME(0, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E65DC[] = static const union AnimCmd sAnim_IceBallChunk_1[] =
{ {
ANIMCMD_FRAME(16, 4), ANIMCMD_FRAME(16, 4),
ANIMCMD_FRAME(32, 4), ANIMCMD_FRAME(32, 4),
@@ -450,68 +451,68 @@ static const union AnimCmd gUnknown_83E65DC[] =
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd *const gUnknown_83E65F0[] = static const union AnimCmd *const sAnims_IceBallChunk[] =
{ {
gUnknown_83E65D4, sAnim_IceBallChunk_0,
gUnknown_83E65DC, sAnim_IceBallChunk_1,
}; };
static const union AffineAnimCmd gUnknown_83E65F8[] = static const union AffineAnimCmd sAffineAnim_IceBallChunk_0[] =
{ {
AFFINEANIMCMD_FRAME(0xE0, 0xE0, 0, 0), AFFINEANIMCMD_FRAME(0xE0, 0xE0, 0, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E6608[] = static const union AffineAnimCmd sAffineAnim_IceBallChunk_1[] =
{ {
AFFINEANIMCMD_FRAME(0x118, 0x118, 0, 0), AFFINEANIMCMD_FRAME(0x118, 0x118, 0, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E6618[] = static const union AffineAnimCmd sAffineAnim_IceBallChunk_2[] =
{ {
AFFINEANIMCMD_FRAME(0x150, 0x150, 0, 0), AFFINEANIMCMD_FRAME(0x150, 0x150, 0, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E6628[] = static const union AffineAnimCmd sAffineAnim_IceBallChunk_3[] =
{ {
AFFINEANIMCMD_FRAME(0x180, 0x180, 0, 0), AFFINEANIMCMD_FRAME(0x180, 0x180, 0, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E6638[] = static const union AffineAnimCmd sAffineAnim_IceBallChunk_4[] =
{ {
AFFINEANIMCMD_FRAME(0x1C0, 0x1C0, 0, 0), AFFINEANIMCMD_FRAME(0x1C0, 0x1C0, 0, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gUnknown_83E6648[] = static const union AffineAnimCmd *const sAffineAnims_IceBallChunk[] =
{ {
gUnknown_83E65F8, sAffineAnim_IceBallChunk_0,
gUnknown_83E6608, sAffineAnim_IceBallChunk_1,
gUnknown_83E6618, sAffineAnim_IceBallChunk_2,
gUnknown_83E6628, sAffineAnim_IceBallChunk_3,
gUnknown_83E6638, sAffineAnim_IceBallChunk_4,
}; };
const struct SpriteTemplate gUnknown_83E665C = const struct SpriteTemplate gIceBallChunkSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ICE_CHUNK, .tileTag = ANIM_TAG_ICE_CHUNK,
.paletteTag = ANIM_TAG_ICE_CHUNK, .paletteTag = ANIM_TAG_ICE_CHUNK,
.oam = &gOamData_AffineDouble_ObjNormal_32x32, .oam = &gOamData_AffineDouble_ObjNormal_32x32,
.anims = gUnknown_83E65F0, .anims = sAnims_IceBallChunk,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E6648, .affineAnims = sAffineAnims_IceBallChunk,
.callback = InitIceBallAnim, .callback = InitIceBallAnim,
}; };
const struct SpriteTemplate gUnknown_83E6674 = const struct SpriteTemplate gIceBallImpactShardSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ICE_CRYSTALS, .tileTag = ANIM_TAG_ICE_CRYSTALS,
.paletteTag = ANIM_TAG_ICE_CRYSTALS, .paletteTag = ANIM_TAG_ICE_CRYSTALS,
.oam = &gOamData_AffineOff_ObjNormal_8x8, .oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gUnknown_83E6324, .anims = sAnims_IceCrystalSmall,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = InitIceBallParticle, .callback = InitIceBallParticle,
@@ -1305,11 +1306,11 @@ static bool8 GenerateHailParticle(u8 hailStructId, u8 affineAnimNum, u8 taskId,
s16 battlerX, battlerY; s16 battlerX, battlerY;
s16 spriteX; s16 spriteX;
bool8 possibleBool = FALSE; bool8 possibleBool = FALSE;
s8 unk = gUnknown_83E652C[hailStructId].unk3; s8 unk = sHailCoordData[hailStructId].unk3;
if (unk != 2) if (unk != 2)
{ {
id = GetBattlerAtPosition(gUnknown_83E652C[hailStructId].unk2); id = GetBattlerAtPosition(sHailCoordData[hailStructId].unk2);
if (IsBattlerSpriteVisible(id)) if (IsBattlerSpriteVisible(id))
{ {
possibleBool = TRUE; possibleBool = TRUE;
@@ -1329,17 +1330,17 @@ static bool8 GenerateHailParticle(u8 hailStructId, u8 affineAnimNum, u8 taskId,
} }
else else
{ {
battlerX = (gUnknown_83E652C[hailStructId].unk0); battlerX = (sHailCoordData[hailStructId].unk0);
battlerY = (gUnknown_83E652C[hailStructId].unk1); battlerY = (sHailCoordData[hailStructId].unk1);
} }
} }
else else
{ {
battlerX = (gUnknown_83E652C[hailStructId].unk0); battlerX = (sHailCoordData[hailStructId].unk0);
battlerY = (gUnknown_83E652C[hailStructId].unk1); battlerY = (sHailCoordData[hailStructId].unk1);
} }
spriteX = battlerX - ((battlerY + 8) / 2); spriteX = battlerX - ((battlerY + 8) / 2);
id = CreateSprite(&gUnknown_83E65A4, spriteX, -8, 18); id = CreateSprite(&sHailParticleSpriteTemplate, spriteX, -8, 18);
if (id == MAX_SPRITES) if (id == MAX_SPRITES)
{ {
return FALSE; return FALSE;
@@ -1367,7 +1368,7 @@ static void AnimHailBegin(struct Sprite *sprite)
return; return;
if (sprite->data[0] == 1 && sprite->data[5] == 0) if (sprite->data[0] == 1 && sprite->data[5] == 0)
{ {
spriteId = CreateSprite(&gUnknown_83E63E0, sprite->data[3], sprite->data[4], sprite->subpriority); spriteId = CreateSprite(&gIceCrystalHitLargeSpriteTemplate, sprite->data[3], sprite->data[4], sprite->subpriority);
sprite->data[0] = spriteId; sprite->data[0] = spriteId;
if (spriteId != 64) if (spriteId != 64)
{ {
src/normal.c
+63 -63
View File
@@ -7,16 +7,16 @@
static void AnimConfusionDuck(struct Sprite *sprite); static void AnimConfusionDuck(struct Sprite *sprite);
static void AnimSimplePaletteBlend(struct Sprite *sprite); static void AnimSimplePaletteBlend(struct Sprite *sprite);
static void sub_80B9A7C(struct Sprite *sprite); static void AnimComplexPaletteBlend(struct Sprite *sprite);
static void sub_80B9B8C(struct Sprite *sprite); static void sub_80B9B8C(struct Sprite *sprite);
static void sub_80BA27C(struct Sprite *sprite); static void AnimShakeMonOrBattleTerrain(struct Sprite *sprite);
static void sub_80BA560(struct Sprite *sprite); static void AnimHitSplatBasic(struct Sprite *sprite);
static void sub_80BA5F8(struct Sprite *sprite); static void AnimHitSplatHandleInvert(struct Sprite *sprite);
static void sub_80BA630(struct Sprite *sprite); static void AnimHitSplatRandom(struct Sprite *sprite);
static void sub_80BA6C8(struct Sprite *sprite); static void AnimHitSplatOnMonEdge(struct Sprite *sprite);
static void sub_80BA738(struct Sprite *sprite); static void AnimCrossImpact(struct Sprite *sprite);
static void sub_80BA780(struct Sprite *sprite); static void AnimFlashingHitSplat(struct Sprite *sprite);
static void sub_80BA5A8(struct Sprite *sprite); static void AnimHitSplatPersistent(struct Sprite *sprite);
static void AnimConfusionDuckStep(struct Sprite *sprite); static void AnimConfusionDuckStep(struct Sprite *sprite);
static void AnimSimplePaletteBlendStep(struct Sprite *sprite); static void AnimSimplePaletteBlendStep(struct Sprite *sprite);
static void sub_80B9AD0(struct Sprite *sprite); static void sub_80B9AD0(struct Sprite *sprite);
@@ -35,7 +35,7 @@ static void sub_80BA4D0(u8 taskId);
static void sub_80BA7BC(struct Sprite *sprite); static void sub_80BA7BC(struct Sprite *sprite);
static const union AnimCmd gUnknown_83E7ADC[] = static const union AnimCmd sAnim_ConfusionDuck_0[] =
{ {
ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(0, 8),
ANIMCMD_FRAME(4, 8), ANIMCMD_FRAME(4, 8),
@@ -44,7 +44,7 @@ static const union AnimCmd gUnknown_83E7ADC[] =
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
static const union AnimCmd gUnknown_83E7AF0[] = static const union AnimCmd sAnim_ConfusionDuck_1[] =
{ {
ANIMCMD_FRAME(0, 8, .hFlip = TRUE), ANIMCMD_FRAME(0, 8, .hFlip = TRUE),
ANIMCMD_FRAME(4, 8), ANIMCMD_FRAME(4, 8),
@@ -53,10 +53,10 @@ static const union AnimCmd gUnknown_83E7AF0[] =
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
static const union AnimCmd *const gUnknown_83E7B04[] = static const union AnimCmd *const sAnims_ConfusionDuck[] =
{ {
gUnknown_83E7ADC, sAnim_ConfusionDuck_0,
gUnknown_83E7AF0, sAnim_ConfusionDuck_1,
}; };
const struct SpriteTemplate gConfusionDuckSpriteTemplate = const struct SpriteTemplate gConfusionDuckSpriteTemplate =
@@ -64,7 +64,7 @@ const struct SpriteTemplate gConfusionDuckSpriteTemplate =
.tileTag = ANIM_TAG_DUCK, .tileTag = ANIM_TAG_DUCK,
.paletteTag = ANIM_TAG_DUCK, .paletteTag = ANIM_TAG_DUCK,
.oam = &gOamData_AffineOff_ObjNormal_16x16, .oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gUnknown_83E7B04, .anims = sAnims_ConfusionDuck,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimConfusionDuck, .callback = AnimConfusionDuck,
@@ -89,7 +89,7 @@ const struct SpriteTemplate gComplexPaletteBlendSpriteTemplate =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B9A7C, .callback = AnimComplexPaletteBlend,
}; };
static const union AnimCmd gUnknown_83E7B54[] = static const union AnimCmd gUnknown_83E7B54[] =
@@ -118,7 +118,7 @@ const struct SpriteTemplate gUnknown_83E7B70 =
.callback = sub_80B9B8C, .callback = sub_80B9B8C,
}; };
const struct SpriteTemplate gUnknown_83E7B88 = const struct SpriteTemplate gShakeMonOrTerrainSpriteTemplate =
{ {
.tileTag = 0, .tileTag = 0,
.paletteTag = 0, .paletteTag = 0,
@@ -126,42 +126,42 @@ const struct SpriteTemplate gUnknown_83E7B88 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80BA27C, .callback = AnimShakeMonOrBattleTerrain,
}; };
static const union AffineAnimCmd gUnknown_83E7BA0[] = static const union AffineAnimCmd sAffineAnim_HitSplat_0[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8), AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E7BB0[] = static const union AffineAnimCmd sAffineAnim_HitSplat_1[] =
{ {
AFFINEANIMCMD_FRAME(0xD8, 0xD8, 0, 0), AFFINEANIMCMD_FRAME(0xD8, 0xD8, 0, 0),
AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8), AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E7BC8[] = static const union AffineAnimCmd sAffineAnim_HitSplat_2[] =
{ {
AFFINEANIMCMD_FRAME(0xB0, 0xB0, 0, 0), AFFINEANIMCMD_FRAME(0xB0, 0xB0, 0, 0),
AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8), AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E7BE0[] = static const union AffineAnimCmd sAffineAnim_HitSplat_3[] =
{ {
AFFINEANIMCMD_FRAME(0x80, 0x80, 0, 0), AFFINEANIMCMD_FRAME(0x80, 0x80, 0, 0),
AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8), AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gUnknown_83E7BF8[] = static const union AffineAnimCmd *const sAffineAnims_HitSplat[] =
{ {
gUnknown_83E7BA0, sAffineAnim_HitSplat_0,
gUnknown_83E7BB0, sAffineAnim_HitSplat_1,
gUnknown_83E7BC8, sAffineAnim_HitSplat_2,
gUnknown_83E7BE0, sAffineAnim_HitSplat_3,
}; };
const struct SpriteTemplate gBasicHitSplatSpriteTemplate = const struct SpriteTemplate gBasicHitSplatSpriteTemplate =
@@ -171,19 +171,19 @@ const struct SpriteTemplate gBasicHitSplatSpriteTemplate =
.oam = &gOamData_AffineNormal_ObjBlend_32x32, .oam = &gOamData_AffineNormal_ObjBlend_32x32,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E7BF8, .affineAnims = sAffineAnims_HitSplat,
.callback = sub_80BA560, .callback = AnimHitSplatBasic,
}; };
const struct SpriteTemplate gUnknown_83E7C20 = const struct SpriteTemplate gHandleInvertHitSplatSpriteTemplate =
{ {
.tileTag = ANIM_TAG_IMPACT, .tileTag = ANIM_TAG_IMPACT,
.paletteTag = ANIM_TAG_IMPACT, .paletteTag = ANIM_TAG_IMPACT,
.oam = &gOamData_AffineNormal_ObjBlend_32x32, .oam = &gOamData_AffineNormal_ObjBlend_32x32,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E7BF8, .affineAnims = sAffineAnims_HitSplat,
.callback = sub_80BA5F8, .callback = AnimHitSplatHandleInvert,
}; };
const struct SpriteTemplate gWaterHitSplatSpriteTemplate = const struct SpriteTemplate gWaterHitSplatSpriteTemplate =
@@ -193,33 +193,33 @@ const struct SpriteTemplate gWaterHitSplatSpriteTemplate =
.oam = &gOamData_AffineNormal_ObjBlend_32x32, .oam = &gOamData_AffineNormal_ObjBlend_32x32,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E7BF8, .affineAnims = sAffineAnims_HitSplat,
.callback = sub_80BA560, .callback = AnimHitSplatBasic,
}; };
const struct SpriteTemplate gUnknown_83E7C50 = const struct SpriteTemplate gRandomPosHitSplatSpriteTemplate =
{ {
.tileTag = ANIM_TAG_IMPACT, .tileTag = ANIM_TAG_IMPACT,
.paletteTag = ANIM_TAG_IMPACT, .paletteTag = ANIM_TAG_IMPACT,
.oam = &gOamData_AffineNormal_ObjBlend_32x32, .oam = &gOamData_AffineNormal_ObjBlend_32x32,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E7BF8, .affineAnims = sAffineAnims_HitSplat,
.callback = sub_80BA630, .callback = AnimHitSplatRandom,
}; };
const struct SpriteTemplate gUnknown_83E7C68 = const struct SpriteTemplate gMonEdgeHitSplatSpriteTemplate =
{ {
.tileTag = ANIM_TAG_IMPACT, .tileTag = ANIM_TAG_IMPACT,
.paletteTag = ANIM_TAG_IMPACT, .paletteTag = ANIM_TAG_IMPACT,
.oam = &gOamData_AffineNormal_ObjBlend_32x32, .oam = &gOamData_AffineNormal_ObjBlend_32x32,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E7BF8, .affineAnims = sAffineAnims_HitSplat,
.callback = sub_80BA6C8, .callback = AnimHitSplatOnMonEdge,
}; };
const struct SpriteTemplate gUnknown_83E7C80 = const struct SpriteTemplate gCrossImpactSpriteTemplate =
{ {
.tileTag = ANIM_TAG_CROSS_IMPACT, .tileTag = ANIM_TAG_CROSS_IMPACT,
.paletteTag = ANIM_TAG_CROSS_IMPACT, .paletteTag = ANIM_TAG_CROSS_IMPACT,
@@ -227,29 +227,29 @@ const struct SpriteTemplate gUnknown_83E7C80 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80BA738, .callback = AnimCrossImpact,
}; };
const struct SpriteTemplate gUnknown_83E7C98 = const struct SpriteTemplate gFlashingHitSplatSpriteTemplate =
{ {
.tileTag = ANIM_TAG_IMPACT, .tileTag = ANIM_TAG_IMPACT,
.paletteTag = ANIM_TAG_IMPACT, .paletteTag = ANIM_TAG_IMPACT,
.oam = &gOamData_AffineNormal_ObjNormal_32x32, .oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E7BF8, .affineAnims = sAffineAnims_HitSplat,
.callback = sub_80BA780, .callback = AnimFlashingHitSplat,
}; };
const struct SpriteTemplate gUnknown_83E7CB0 = const struct SpriteTemplate gPersistHitSplatSpriteTemplate =
{ {
.tileTag = ANIM_TAG_IMPACT, .tileTag = ANIM_TAG_IMPACT,
.paletteTag = ANIM_TAG_IMPACT, .paletteTag = ANIM_TAG_IMPACT,
.oam = &gOamData_AffineNormal_ObjBlend_32x32, .oam = &gOamData_AffineNormal_ObjBlend_32x32,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E7BF8, .affineAnims = sAffineAnims_HitSplat,
.callback = sub_80BA5A8, .callback = AnimHitSplatPersistent,
}; };
// Moves a spinning duck around the mon's head. // Moves a spinning duck around the mon's head.
@@ -335,7 +335,7 @@ static void AnimSimplePaletteBlendStep(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
static void sub_80B9A7C(struct Sprite *sprite) static void AnimComplexPaletteBlend(struct Sprite *sprite)
{ {
u32 selectedPalettes; u32 selectedPalettes;
@@ -461,7 +461,7 @@ static void sub_80B9C7C(u8 taskId)
} }
} }
void sub_80B9CE4(u8 taskId) void AnimTask_BlendColorCycleExclude(u8 taskId)
{ {
s32 battler; s32 battler;
u32 selectedPalettes = 0; u32 selectedPalettes = 0;
@@ -527,7 +527,7 @@ static void sub_80B9DF0(u8 taskId)
} }
} }
void sub_80B9E58(u8 taskId) void AnimTask_BlendColorCycleByTag(u8 taskId)
{ {
u8 paletteIndex; u8 paletteIndex;
@@ -585,7 +585,7 @@ static void sub_80B9F04(u8 taskId)
} }
} }
void sub_80B9F6C(u8 taskId) void AnimTask_FlashAnimTagWithColor(u8 taskId)
{ {
u8 paletteIndex; u8 paletteIndex;
@@ -652,7 +652,7 @@ static void sub_80BA090(u8 taskId)
} }
} }
void sub_80BA0E8(u8 taskId) void AnimTask_InvertScreenColor(u8 taskId)
{ {
u32 selectedPalettes = 0; u32 selectedPalettes = 0;
u8 attackerBattler = gBattleAnimAttacker; u8 attackerBattler = gBattleAnimAttacker;
@@ -708,7 +708,7 @@ static void sub_80BA16C(u8 taskId)
} }
} }
static void sub_80BA27C(struct Sprite *sprite) static void AnimShakeMonOrBattleTerrain(struct Sprite *sprite)
{ {
u16 var0; u16 var0;
@@ -789,7 +789,7 @@ static void sub_80BA3CC(void)
} }
} }
void sub_80BA47C(u8 taskId) void AnimTask_ShakeBattleTerrain(u8 taskId)
{ {
gTasks[taskId].data[0] = gBattleAnimArgs[0]; gTasks[taskId].data[0] = gBattleAnimArgs[0];
gTasks[taskId].data[1] = gBattleAnimArgs[1]; gTasks[taskId].data[1] = gBattleAnimArgs[1];
@@ -830,7 +830,7 @@ static void sub_80BA4D0(u8 taskId)
} }
} }
static void sub_80BA560(struct Sprite *sprite) static void AnimHitSplatBasic(struct Sprite *sprite)
{ {
StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]); StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]);
if (gBattleAnimArgs[2] == 0) if (gBattleAnimArgs[2] == 0)
@@ -841,7 +841,7 @@ static void sub_80BA560(struct Sprite *sprite)
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
} }
static void sub_80BA5A8(struct Sprite *sprite) static void AnimHitSplatPersistent(struct Sprite *sprite)
{ {
StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]); StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]);
if (gBattleAnimArgs[2] == 0) if (gBattleAnimArgs[2] == 0)
@@ -853,14 +853,14 @@ static void sub_80BA5A8(struct Sprite *sprite)
StoreSpriteCallbackInData6(sprite, sub_80B1D3C); StoreSpriteCallbackInData6(sprite, sub_80B1D3C);
} }
static void sub_80BA5F8(struct Sprite *sprite) static void AnimHitSplatHandleInvert(struct Sprite *sprite)
{ {
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER && !IsContest()) if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER && !IsContest())
gBattleAnimArgs[1] = -gBattleAnimArgs[1]; gBattleAnimArgs[1] = -gBattleAnimArgs[1];
sub_80BA560(sprite); AnimHitSplatBasic(sprite);
} }
static void sub_80BA630(struct Sprite *sprite) static void AnimHitSplatRandom(struct Sprite *sprite)
{ {
if (gBattleAnimArgs[1] == -1) if (gBattleAnimArgs[1] == -1)
gBattleAnimArgs[1] = Random() & 3; gBattleAnimArgs[1] = Random() & 3;
@@ -875,7 +875,7 @@ static void sub_80BA630(struct Sprite *sprite)
sprite->callback = RunStoredCallbackWhenAffineAnimEnds; sprite->callback = RunStoredCallbackWhenAffineAnimEnds;
} }
static void sub_80BA6C8(struct Sprite *sprite) static void AnimHitSplatOnMonEdge(struct Sprite *sprite)
{ {
sprite->data[0] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]); sprite->data[0] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
sprite->pos1.x = gSprites[sprite->data[0]].pos1.x + gSprites[sprite->data[0]].pos2.x; sprite->pos1.x = gSprites[sprite->data[0]].pos1.x + gSprites[sprite->data[0]].pos2.x;
@@ -887,7 +887,7 @@ static void sub_80BA6C8(struct Sprite *sprite)
sprite->callback = RunStoredCallbackWhenAffineAnimEnds; sprite->callback = RunStoredCallbackWhenAffineAnimEnds;
} }
static void sub_80BA738(struct Sprite *sprite) static void AnimCrossImpact(struct Sprite *sprite)
{ {
if (gBattleAnimArgs[2] == 0) if (gBattleAnimArgs[2] == 0)
InitSpritePosToAnimAttacker(sprite, 1); InitSpritePosToAnimAttacker(sprite, 1);
@@ -898,7 +898,7 @@ static void sub_80BA738(struct Sprite *sprite)
sprite->callback = WaitAnimForDuration; sprite->callback = WaitAnimForDuration;
} }
static void sub_80BA780(struct Sprite *sprite) static void AnimFlashingHitSplat(struct Sprite *sprite)
{ {
StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]); StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]);
if (gBattleAnimArgs[2] == 0) if (gBattleAnimArgs[2] == 0)
src/poison.c
+51 -51
View File
@@ -2,17 +2,17 @@
#include "battle_anim.h" #include "battle_anim.h"
#include "trig.h" #include "trig.h"
static void sub_80B1620(struct Sprite *sprite); static void AnimSludgeProjectile(struct Sprite *sprite);
static void sub_80B16A0(struct Sprite *sprite); static void AnimAcidPoisonBubble(struct Sprite *sprite);
static void sub_80B1744(struct Sprite *sprite); static void AnimSludgeBombHitParticle(struct Sprite *sprite);
static void sub_80B17C4(struct Sprite *sprite); static void AnimAcidPoisonDroplet(struct Sprite *sprite);
static void AnimBubbleEffect(struct Sprite *sprite); static void AnimBubbleEffect(struct Sprite *sprite);
static void sub_80B1684(struct Sprite *sprite); static void sub_80B1684(struct Sprite *sprite);
static void sub_80B1728(struct Sprite *sprite); static void sub_80B1728(struct Sprite *sprite);
static void sub_80B1798(struct Sprite *sprite); static void sub_80B1798(struct Sprite *sprite);
static void AnimBubbleEffectStep(struct Sprite *sprite); static void AnimBubbleEffectStep(struct Sprite *sprite);
static const union AnimCmd gUnknown_83E6994[] = static const union AnimCmd sAnim_ToxicBubble[] =
{ {
ANIMCMD_FRAME(0, 5), ANIMCMD_FRAME(0, 5),
ANIMCMD_FRAME(8, 5), ANIMCMD_FRAME(8, 5),
@@ -21,56 +21,56 @@ static const union AnimCmd gUnknown_83E6994[] =
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd *const gUnknown_83E69A8[] = static const union AnimCmd *const sAnims_ToxicBubble[] =
{ {
gUnknown_83E6994, sAnim_ToxicBubble,
}; };
const struct SpriteTemplate gUnknown_83E69AC = const struct SpriteTemplate gToxicBubbleSpriteTemplate =
{ {
.tileTag = ANIM_TAG_TOXIC_BUBBLE, .tileTag = ANIM_TAG_TOXIC_BUBBLE,
.paletteTag = ANIM_TAG_TOXIC_BUBBLE, .paletteTag = ANIM_TAG_TOXIC_BUBBLE,
.oam = &gOamData_AffineOff_ObjNormal_16x32, .oam = &gOamData_AffineOff_ObjNormal_16x32,
.anims = gUnknown_83E69A8, .anims = sAnims_ToxicBubble,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimSpriteOnMonPos, .callback = AnimSpriteOnMonPos,
}; };
static const union AnimCmd gUnknown_83E69C4[] = static const union AnimCmd sAnim_PoisonProjectile[] =
{ {
ANIMCMD_FRAME(0, 1), ANIMCMD_FRAME(0, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E69CC[] = static const union AnimCmd sAnim_AcidPoisonDroplet[] =
{ {
ANIMCMD_FRAME(4, 1), ANIMCMD_FRAME(4, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E69D4[] = static const union AnimCmd sAnim_SludgeBombHit[] =
{ {
ANIMCMD_FRAME(8, 1), ANIMCMD_FRAME(8, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd *const gUnknown_83E69DC[] = static const union AnimCmd *const sAnims_PoisonProjectile[] =
{ {
gUnknown_83E69C4, sAnim_PoisonProjectile,
}; };
static const union AnimCmd *const gUnknown_83E69E0[] = static const union AnimCmd *const sAnims_AcidPoisonDroplet[] =
{ {
gUnknown_83E69CC, sAnim_AcidPoisonDroplet,
}; };
static const union AnimCmd *const gUnknown_83E69E4[] = static const union AnimCmd *const sAnims_SludgeBombHit[] =
{ {
gUnknown_83E69D4, sAnim_SludgeBombHit,
}; };
static const union AffineAnimCmd gUnknown_83E69E8[] = static const union AffineAnimCmd sAffineAnim_PoisonProjectile[] =
{ {
AFFINEANIMCMD_FRAME(0x160, 0x160, 0, 0), AFFINEANIMCMD_FRAME(0x160, 0x160, 0, 0),
AFFINEANIMCMD_FRAME(-0xA, -0xA, 0, 10), AFFINEANIMCMD_FRAME(-0xA, -0xA, 0, 10),
@@ -78,56 +78,56 @@ static const union AffineAnimCmd gUnknown_83E69E8[] =
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
static const union AffineAnimCmd gUnknown_83E6A08[] = static const union AffineAnimCmd sAffineAnim_SludgeBombHit[] =
{ {
AFFINEANIMCMD_FRAME(0xEC, 0xEC, 0, 0), AFFINEANIMCMD_FRAME(0xEC, 0xEC, 0, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gUnknown_83E6A18[] = static const union AffineAnimCmd *const sAffineAnims_PoisonProjectile[] =
{ {
gUnknown_83E69E8, sAffineAnim_PoisonProjectile,
}; };
static const union AffineAnimCmd *const gUnknown_83E6A1C[] = static const union AffineAnimCmd *const sAffineAnims_SludgeBombHit[] =
{ {
gUnknown_83E6A08, sAffineAnim_SludgeBombHit,
}; };
const struct SpriteTemplate gUnknown_83E6A20 = const struct SpriteTemplate gSludgeProjectileSpriteTemplate =
{ {
.tileTag = ANIM_TAG_POISON_BUBBLE, .tileTag = ANIM_TAG_POISON_BUBBLE,
.paletteTag = ANIM_TAG_POISON_BUBBLE, .paletteTag = ANIM_TAG_POISON_BUBBLE,
.oam = &gOamData_AffineDouble_ObjNormal_16x16, .oam = &gOamData_AffineDouble_ObjNormal_16x16,
.anims = gUnknown_83E69DC, .anims = sAnims_PoisonProjectile,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E6A18, .affineAnims = sAffineAnims_PoisonProjectile,
.callback = sub_80B1620, .callback = AnimSludgeProjectile,
}; };
const struct SpriteTemplate gUnknown_83E6A38 = const struct SpriteTemplate gAcidPoisonBubbleSpriteTemplate =
{ {
.tileTag = ANIM_TAG_POISON_BUBBLE, .tileTag = ANIM_TAG_POISON_BUBBLE,
.paletteTag = ANIM_TAG_POISON_BUBBLE, .paletteTag = ANIM_TAG_POISON_BUBBLE,
.oam = &gOamData_AffineDouble_ObjNormal_16x16, .oam = &gOamData_AffineDouble_ObjNormal_16x16,
.anims = gUnknown_83E69DC, .anims = sAnims_PoisonProjectile,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E6A18, .affineAnims = sAffineAnims_PoisonProjectile,
.callback = sub_80B16A0, .callback = AnimAcidPoisonBubble,
}; };
const struct SpriteTemplate gUnknown_83E6A50 = const struct SpriteTemplate gSludgeBombHitParticleSpriteTemplate =
{ {
.tileTag = ANIM_TAG_POISON_BUBBLE, .tileTag = ANIM_TAG_POISON_BUBBLE,
.paletteTag = ANIM_TAG_POISON_BUBBLE, .paletteTag = ANIM_TAG_POISON_BUBBLE,
.oam = &gOamData_AffineNormal_ObjNormal_16x16, .oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gUnknown_83E69E4, .anims = sAnims_SludgeBombHit,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E6A1C, .affineAnims = sAffineAnims_SludgeBombHit,
.callback = sub_80B1744, .callback = AnimSludgeBombHitParticle,
}; };
static const union AffineAnimCmd gUnknown_83E6A68[] = static const union AffineAnimCmd sAffineAnim_AcidPoisonDroplet[] =
{ {
AFFINEANIMCMD_FRAME(-0x10, 0x10, 0, 6), AFFINEANIMCMD_FRAME(-0x10, 0x10, 0, 6),
AFFINEANIMCMD_FRAME(0x10, -0x10, 0, 6), AFFINEANIMCMD_FRAME(0x10, -0x10, 0, 6),
@@ -136,30 +136,30 @@ static const union AffineAnimCmd gUnknown_83E6A68[] =
const union AffineAnimCmd *const gAffineAnims_Droplet[] = const union AffineAnimCmd *const gAffineAnims_Droplet[] =
{ {
gUnknown_83E6A68, sAffineAnim_AcidPoisonDroplet,
}; };
const struct SpriteTemplate gUnknown_83E6A84 = const struct SpriteTemplate gAcidPoisonDropletSpriteTemplate =
{ {
.tileTag = ANIM_TAG_POISON_BUBBLE, .tileTag = ANIM_TAG_POISON_BUBBLE,
.paletteTag = ANIM_TAG_POISON_BUBBLE, .paletteTag = ANIM_TAG_POISON_BUBBLE,
.oam = &gOamData_AffineDouble_ObjNormal_16x16, .oam = &gOamData_AffineDouble_ObjNormal_16x16,
.anims = gUnknown_83E69E0, .anims = sAnims_AcidPoisonDroplet,
.images = NULL, .images = NULL,
.affineAnims = gAffineAnims_Droplet, .affineAnims = gAffineAnims_Droplet,
.callback = sub_80B17C4, .callback = AnimAcidPoisonDroplet,
}; };
static const union AffineAnimCmd gUnknown_83E6A9C[] = static const union AffineAnimCmd sAffineAnim_Bubble[] =
{ {
AFFINEANIMCMD_FRAME(0x9C, 0x9C, 0, 0), AFFINEANIMCMD_FRAME(0x9C, 0x9C, 0, 0),
AFFINEANIMCMD_FRAME(0x5, 0x5, 0, 20), AFFINEANIMCMD_FRAME(0x5, 0x5, 0, 20),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gUnknown_83E6AB4[] = static const union AffineAnimCmd *const sAffineAnims_Bubble[] =
{ {
gUnknown_83E6A9C, sAffineAnim_Bubble,
}; };
const struct SpriteTemplate gPoisonBubbleSpriteTemplate = const struct SpriteTemplate gPoisonBubbleSpriteTemplate =
@@ -167,9 +167,9 @@ const struct SpriteTemplate gPoisonBubbleSpriteTemplate =
.tileTag = ANIM_TAG_POISON_BUBBLE, .tileTag = ANIM_TAG_POISON_BUBBLE,
.paletteTag = ANIM_TAG_POISON_BUBBLE, .paletteTag = ANIM_TAG_POISON_BUBBLE,
.oam = &gOamData_AffineNormal_ObjNormal_16x16, .oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gUnknown_83E69DC, .anims = sAnims_PoisonProjectile,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E6AB4, .affineAnims = sAffineAnims_Bubble,
.callback = AnimBubbleEffect, .callback = AnimBubbleEffect,
}; };
@@ -180,11 +180,11 @@ const struct SpriteTemplate gWaterBubbleSpriteTemplate =
.oam = &gOamData_AffineNormal_ObjBlend_16x16, .oam = &gOamData_AffineNormal_ObjBlend_16x16,
.anims = gAnims_WaterBubble, .anims = gAnims_WaterBubble,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E6AB4, .affineAnims = sAffineAnims_Bubble,
.callback = AnimBubbleEffect, .callback = AnimBubbleEffect,
}; };
static void sub_80B1620(struct Sprite *sprite) static void AnimSludgeProjectile(struct Sprite *sprite)
{ {
if (!gBattleAnimArgs[3]) if (!gBattleAnimArgs[3])
StartSpriteAnim(sprite, 2); StartSpriteAnim(sprite, 2);
@@ -203,7 +203,7 @@ static void sub_80B1684(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
static void sub_80B16A0(struct Sprite *sprite) static void AnimAcidPoisonBubble(struct Sprite *sprite)
{ {
s16 l1, l2; s16 l1, l2;
@@ -227,7 +227,7 @@ static void sub_80B1728(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
static void sub_80B1744(struct Sprite *sprite) static void AnimSludgeBombHitParticle(struct Sprite *sprite)
{ {
sprite->data[0] = gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[2];
sprite->data[1] = sprite->pos1.x; sprite->data[1] = sprite->pos1.x;
@@ -249,7 +249,7 @@ static void sub_80B1798(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
static void sub_80B17C4(struct Sprite *sprite) static void AnimAcidPoisonDroplet(struct Sprite *sprite)
{ {
SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y); SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y);
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
src/psychic.c
+102 -102
View File
@@ -5,13 +5,13 @@
#include "trig.h" #include "trig.h"
#include "constants/songs.h" #include "constants/songs.h"
static void sub_80B2ECC(struct Sprite *sprite); static void AnimDefensiveWall(struct Sprite *sprite);
static void sub_80B31D0(struct Sprite *sprite); static void AnimWallSparkle(struct Sprite *sprite);
static void sub_80B3278(struct Sprite *sprite); static void AnimBentSpoon(struct Sprite *sprite);
static void sub_80B32F4(struct Sprite *sprite); static void AnimQuestionMark(struct Sprite *sprite);
static void sub_80B37EC(struct Sprite *sprite); static void AnimRedX(struct Sprite *sprite);
static void sub_80B3A34(struct Sprite *sprite); static void AnimSkillSwapOrb(struct Sprite *sprite);
static void sub_80B3E84(struct Sprite *sprite); static void AnimPsychoBoost(struct Sprite *sprite);
static void sub_80B300C(struct Sprite *sprite); static void sub_80B300C(struct Sprite *sprite);
static void sub_80B3044(struct Sprite *sprite); static void sub_80B3044(struct Sprite *sprite);
static void sub_80B30B0(struct Sprite *sprite); static void sub_80B30B0(struct Sprite *sprite);
@@ -25,30 +25,30 @@ static void sub_80B3980(u8 taskId);
static void sub_80B3B78(u8 taskId); static void sub_80B3B78(u8 taskId);
static void sub_80B3D78(u8 taskId); static void sub_80B3D78(u8 taskId);
static const union AffineAnimCmd gUnknown_83E6DDC[] = static const union AffineAnimCmd sAffineAnim_PsychUpSpiral[] =
{ {
AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0), AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
AFFINEANIMCMD_FRAME(-0x2, -0x2, -10, 120), AFFINEANIMCMD_FRAME(-0x2, -0x2, -10, 120),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gUnknown_83E6DF4[] = static const union AffineAnimCmd *const sAffineAnims_PsychUpSpiral[] =
{ {
gUnknown_83E6DDC, sAffineAnim_PsychUpSpiral,
}; };
const struct SpriteTemplate gUnknown_83E6DF8 = const struct SpriteTemplate gPsychUpSpiralSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SPIRAL, .tileTag = ANIM_TAG_SPIRAL,
.paletteTag = ANIM_TAG_SPIRAL, .paletteTag = ANIM_TAG_SPIRAL,
.oam = &gOamData_AffineNormal_ObjBlend_64x64, .oam = &gOamData_AffineNormal_ObjBlend_64x64,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E6DF4, .affineAnims = sAffineAnims_PsychUpSpiral,
.callback = AnimSpriteOnMonPos, .callback = AnimSpriteOnMonPos,
}; };
const struct SpriteTemplate gUnknown_83E6E10 = const struct SpriteTemplate gLightScreenWallSpriteTemplate =
{ {
.tileTag = ANIM_TAG_GREEN_LIGHT_WALL, .tileTag = ANIM_TAG_GREEN_LIGHT_WALL,
.paletteTag = ANIM_TAG_GREEN_LIGHT_WALL, .paletteTag = ANIM_TAG_GREEN_LIGHT_WALL,
@@ -56,10 +56,10 @@ const struct SpriteTemplate gUnknown_83E6E10 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B2ECC, .callback = AnimDefensiveWall,
}; };
const struct SpriteTemplate gUnknown_83E6E28 = const struct SpriteTemplate gReflectWallSpriteTemplate =
{ {
.tileTag = ANIM_TAG_BLUE_LIGHT_WALL, .tileTag = ANIM_TAG_BLUE_LIGHT_WALL,
.paletteTag = ANIM_TAG_BLUE_LIGHT_WALL, .paletteTag = ANIM_TAG_BLUE_LIGHT_WALL,
@@ -67,10 +67,10 @@ const struct SpriteTemplate gUnknown_83E6E28 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B2ECC, .callback = AnimDefensiveWall,
}; };
const struct SpriteTemplate gUnknown_83E6E40 = const struct SpriteTemplate gMirrorCoatWallSpriteTemplate =
{ {
.tileTag = ANIM_TAG_RED_LIGHT_WALL, .tileTag = ANIM_TAG_RED_LIGHT_WALL,
.paletteTag = ANIM_TAG_RED_LIGHT_WALL, .paletteTag = ANIM_TAG_RED_LIGHT_WALL,
@@ -78,10 +78,10 @@ const struct SpriteTemplate gUnknown_83E6E40 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B2ECC, .callback = AnimDefensiveWall,
}; };
const struct SpriteTemplate gUnknown_83E6E58 = const struct SpriteTemplate gBarrierWallSpriteTemplate =
{ {
.tileTag = ANIM_TAG_GRAY_LIGHT_WALL, .tileTag = ANIM_TAG_GRAY_LIGHT_WALL,
.paletteTag = ANIM_TAG_GRAY_LIGHT_WALL, .paletteTag = ANIM_TAG_GRAY_LIGHT_WALL,
@@ -89,10 +89,10 @@ const struct SpriteTemplate gUnknown_83E6E58 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B2ECC, .callback = AnimDefensiveWall,
}; };
const struct SpriteTemplate gUnknown_83E6E70 = const struct SpriteTemplate gMagicCoatWallSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ORANGE_LIGHT_WALL, .tileTag = ANIM_TAG_ORANGE_LIGHT_WALL,
.paletteTag = ANIM_TAG_ORANGE_LIGHT_WALL, .paletteTag = ANIM_TAG_ORANGE_LIGHT_WALL,
@@ -100,10 +100,10 @@ const struct SpriteTemplate gUnknown_83E6E70 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B2ECC, .callback = AnimDefensiveWall,
}; };
static const union AnimCmd gUnknown_83E6E88[] = static const union AnimCmd sAnim_ReflectSparkle[] =
{ {
ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(0, 3),
ANIMCMD_FRAME(16, 3), ANIMCMD_FRAME(16, 3),
@@ -113,23 +113,23 @@ static const union AnimCmd gUnknown_83E6E88[] =
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd *const gUnknown_83E6EA0[] = static const union AnimCmd *const sAnims_ReflectSparkle[] =
{ {
gUnknown_83E6E88, sAnim_ReflectSparkle,
}; };
const struct SpriteTemplate gUnknown_83E6EA4 = const struct SpriteTemplate gReflectSparkleSpriteTemplate =
{ {
.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 = gUnknown_83E6EA0, .anims = sAnims_ReflectSparkle,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B31D0, .callback = AnimWallSparkle,
}; };
static const union AnimCmd gUnknown_83E6EBC[] = static const union AnimCmd sAnim_SpecialScreenSparkle[] =
{ {
ANIMCMD_FRAME(0, 5), ANIMCMD_FRAME(0, 5),
ANIMCMD_FRAME(4, 5), ANIMCMD_FRAME(4, 5),
@@ -138,23 +138,23 @@ static const union AnimCmd gUnknown_83E6EBC[] =
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd *const gUnknown_83E6ED0[] = static const union AnimCmd *const sAnims_SpecialScreenSparkle[] =
{ {
gUnknown_83E6EBC, sAnim_SpecialScreenSparkle,
}; };
const struct SpriteTemplate gUnknown_83E6ED4 = const struct SpriteTemplate gSpecialScreenSparkleSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SPARKLE_3, .tileTag = ANIM_TAG_SPARKLE_3,
.paletteTag = ANIM_TAG_SPARKLE_3, .paletteTag = ANIM_TAG_SPARKLE_3,
.oam = &gOamData_AffineOff_ObjNormal_16x16, .oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gUnknown_83E6ED0, .anims = sAnims_SpecialScreenSparkle,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B31D0, .callback = AnimWallSparkle,
}; };
const struct SpriteTemplate gUnknown_83E6EEC = const struct SpriteTemplate gGoldRingSpriteTemplate =
{ {
.tileTag = ANIM_TAG_GOLD_RING, .tileTag = ANIM_TAG_GOLD_RING,
.paletteTag = ANIM_TAG_GOLD_RING, .paletteTag = ANIM_TAG_GOLD_RING,
@@ -165,7 +165,7 @@ const struct SpriteTemplate gUnknown_83E6EEC =
.callback = TranslateAnimSpriteToTargetMonLocation, .callback = TranslateAnimSpriteToTargetMonLocation,
}; };
static const union AnimCmd gUnknown_83E6F04[] = static const union AnimCmd sAnim_BentSpoon_0[] =
{ {
ANIMCMD_FRAME(8, 60, .hFlip = TRUE), ANIMCMD_FRAME(8, 60, .hFlip = TRUE),
ANIMCMD_FRAME(16, 5, .hFlip = TRUE), ANIMCMD_FRAME(16, 5, .hFlip = TRUE),
@@ -185,7 +185,7 @@ static const union AnimCmd gUnknown_83E6F04[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gUnknown_83E6F44[] = static const union AnimCmd sAnim_BentSpoon_1[] =
{ {
ANIMCMD_FRAME(8, 60), ANIMCMD_FRAME(8, 60),
ANIMCMD_FRAME(16, 5), ANIMCMD_FRAME(16, 5),
@@ -205,24 +205,24 @@ const union AnimCmd gUnknown_83E6F44[] =
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd *const gUnknown_83E6F84[] = static const union AnimCmd *const sAnims_BentSpoon[] =
{ {
gUnknown_83E6F04, sAnim_BentSpoon_0,
gUnknown_83E6F44, sAnim_BentSpoon_1,
}; };
const struct SpriteTemplate gUnknown_83E6F8C = const struct SpriteTemplate gBentSpoonSpriteTemplate =
{ {
.tileTag = ANIM_TAG_BENT_SPOON, .tileTag = ANIM_TAG_BENT_SPOON,
.paletteTag = ANIM_TAG_BENT_SPOON, .paletteTag = ANIM_TAG_BENT_SPOON,
.oam = &gOamData_AffineOff_ObjNormal_16x32, .oam = &gOamData_AffineOff_ObjNormal_16x32,
.anims = gUnknown_83E6F84, .anims = sAnims_BentSpoon,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B3278, .callback = AnimBentSpoon,
}; };
static const union AnimCmd gUnknown_83E6FA4[] = static const union AnimCmd sAnim_QuestionMark[] =
{ {
ANIMCMD_FRAME(0, 6), ANIMCMD_FRAME(0, 6),
ANIMCMD_FRAME(16, 6), ANIMCMD_FRAME(16, 6),
@@ -234,12 +234,12 @@ static const union AnimCmd gUnknown_83E6FA4[] =
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd *const gUnknown_83E6FC4[] = static const union AnimCmd *const sAnims_QuestionMark[] =
{ {
gUnknown_83E6FA4, sAnim_QuestionMark,
}; };
static const union AffineAnimCmd gUnknown_83E6FC8[] = static const union AffineAnimCmd sAffineAnim_QuestionMark[] =
{ {
AFFINEANIMCMD_FRAME(0, 0, 4, 4), AFFINEANIMCMD_FRAME(0, 0, 4, 4),
AFFINEANIMCMD_FRAME(0, 0, -4, 8), AFFINEANIMCMD_FRAME(0, 0, -4, 8),
@@ -248,23 +248,23 @@ static const union AffineAnimCmd gUnknown_83E6FC8[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gUnknown_83E6FF0[] = static const union AffineAnimCmd *const sAffineAnims_QuestionMark[] =
{ {
gUnknown_83E6FC8, sAffineAnim_QuestionMark,
}; };
const struct SpriteTemplate gUnknown_83E6FF4 = const struct SpriteTemplate gQuestionMarkSpriteTemplate =
{ {
.tileTag = ANIM_TAG_AMNESIA, .tileTag = ANIM_TAG_AMNESIA,
.paletteTag = ANIM_TAG_AMNESIA, .paletteTag = ANIM_TAG_AMNESIA,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E6FC4, .anims = sAnims_QuestionMark,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B32F4, .callback = AnimQuestionMark,
}; };
static const union AffineAnimCmd gUnknown_83E700C[] = static const union AffineAnimCmd sAffineAnim_MeditateStretchAttacker[] =
{ {
AFFINEANIMCMD_FRAME(-8, 10, 0, 16), AFFINEANIMCMD_FRAME(-8, 10, 0, 16),
AFFINEANIMCMD_FRAME(18, -18, 0, 16), AFFINEANIMCMD_FRAME(18, -18, 0, 16),
@@ -272,14 +272,14 @@ static const union AffineAnimCmd gUnknown_83E700C[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E702C[] = static const union AffineAnimCmd sAffineAnim_Teleport[] =
{ {
AFFINEANIMCMD_FRAME(64, -4, 0, 20), AFFINEANIMCMD_FRAME(64, -4, 0, 20),
AFFINEANIMCMD_FRAME(0, 0, 0, -56), AFFINEANIMCMD_FRAME(0, 0, 0, -56),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const struct SpriteTemplate gUnknown_83E7044 = static const struct SpriteTemplate sImprisonOrbSpriteTemplate =
{ {
.tileTag = ANIM_TAG_HOLLOW_ORB, .tileTag = ANIM_TAG_HOLLOW_ORB,
.paletteTag = ANIM_TAG_HOLLOW_ORB, .paletteTag = ANIM_TAG_HOLLOW_ORB,
@@ -290,25 +290,25 @@ static const struct SpriteTemplate gUnknown_83E7044 =
.callback = SpriteCallbackDummy, .callback = SpriteCallbackDummy,
}; };
const struct SpriteTemplate gUnknown_83E705C = const struct SpriteTemplate gRedXSpriteTemplate =
{ {
.tileTag = 0x280A, .tileTag = ANIM_TAG_X_SIGN,
.paletteTag = 0x280A, .paletteTag = ANIM_TAG_X_SIGN,
.oam = &gOamData_AffineOff_ObjNormal_64x64, .oam = &gOamData_AffineOff_ObjNormal_64x64,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B37EC, .callback = AnimRedX,
}; };
static const union AffineAnimCmd gUnknown_83E7074[] = static const union AffineAnimCmd sAffineAnim_SkillSwapOrb_0[] =
{ {
AFFINEANIMCMD_FRAME(-0x8, -0x8, 0, 8), AFFINEANIMCMD_FRAME(-0x8, -0x8, 0, 8),
AFFINEANIMCMD_FRAME(0x8, 0x8, 0, 8), AFFINEANIMCMD_FRAME(0x8, 0x8, 0, 8),
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
static const union AffineAnimCmd gUnknown_83E708C[] = static const union AffineAnimCmd sAffineAnim_SkillSwapOrb_1[] =
{ {
AFFINEANIMCMD_FRAME(0xF0, 0xF0, 0, 0), AFFINEANIMCMD_FRAME(0xF0, 0xF0, 0, 0),
AFFINEANIMCMD_FRAME(-0x8, -0x8, 0, 6), AFFINEANIMCMD_FRAME(-0x8, -0x8, 0, 6),
@@ -317,7 +317,7 @@ static const union AffineAnimCmd gUnknown_83E708C[] =
AFFINEANIMCMD_JUMP(1), AFFINEANIMCMD_JUMP(1),
}; };
static const union AffineAnimCmd gUnknown_83E70B4[] = static const union AffineAnimCmd sAffineAnim_SkillSwapOrb_2[] =
{ {
AFFINEANIMCMD_FRAME(0xD0, 0xD0, 0, 0), AFFINEANIMCMD_FRAME(0xD0, 0xD0, 0, 0),
AFFINEANIMCMD_FRAME(-0x8, -0x8, 0, 4), AFFINEANIMCMD_FRAME(-0x8, -0x8, 0, 4),
@@ -326,7 +326,7 @@ static const union AffineAnimCmd gUnknown_83E70B4[] =
AFFINEANIMCMD_JUMP(1), AFFINEANIMCMD_JUMP(1),
}; };
static const union AffineAnimCmd gUnknown_83E70DC[] = static const union AffineAnimCmd sAffineAnim_SkillSwapOrb_3[] =
{ {
AFFINEANIMCMD_FRAME(0xB0, 0xB0, 0, 0), AFFINEANIMCMD_FRAME(0xB0, 0xB0, 0, 0),
AFFINEANIMCMD_FRAME(-0x8, -0x8, 0, 2), AFFINEANIMCMD_FRAME(-0x8, -0x8, 0, 2),
@@ -335,49 +335,49 @@ static const union AffineAnimCmd gUnknown_83E70DC[] =
AFFINEANIMCMD_JUMP(1), AFFINEANIMCMD_JUMP(1),
}; };
static const union AffineAnimCmd *const gUnknown_83E7104[] = static const union AffineAnimCmd *const sAffineAnims_SkillSwapOrb[] =
{ {
gUnknown_83E7074, sAffineAnim_SkillSwapOrb_0,
gUnknown_83E708C, sAffineAnim_SkillSwapOrb_1,
gUnknown_83E70B4, sAffineAnim_SkillSwapOrb_2,
gUnknown_83E70DC, sAffineAnim_SkillSwapOrb_3,
}; };
static const struct SpriteTemplate gUnknown_83E7114 = static const struct SpriteTemplate sSkillSwapOrbSpriteTemplate =
{ {
.tileTag = ANIM_TAG_BLUEGREEN_ORB, .tileTag = ANIM_TAG_BLUEGREEN_ORB,
.paletteTag = ANIM_TAG_BLUEGREEN_ORB, .paletteTag = ANIM_TAG_BLUEGREEN_ORB,
.oam = &gOamData_AffineNormal_ObjNormal_16x16, .oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E7104, .affineAnims = sAffineAnims_SkillSwapOrb,
.callback = sub_80B3A34, .callback = AnimSkillSwapOrb,
}; };
static const union AffineAnimCmd gUnknown_83E712C[] = static const union AffineAnimCmd sAffineAnim_LusterPurgeCircle[] =
{ {
AFFINEANIMCMD_FRAME(0x20, 0x20, 0, 0), AFFINEANIMCMD_FRAME(0x20, 0x20, 0, 0),
AFFINEANIMCMD_FRAME(0x4, 0x4, 0, 120), AFFINEANIMCMD_FRAME(0x4, 0x4, 0, 120),
AFFINEANIMCMD_END_ALT(1), AFFINEANIMCMD_END_ALT(1),
}; };
static const union AffineAnimCmd *const gUnknown_83E7144[] = static const union AffineAnimCmd *const gAffineAnims_LusterPurgeCircle[] =
{ {
gUnknown_83E712C, sAffineAnim_LusterPurgeCircle,
}; };
const struct SpriteTemplate gUnknown_83E7148 = const struct SpriteTemplate gLusterPurgeCircleSpriteTemplate =
{ {
.tileTag = ANIM_TAG_WHITE_CIRCLE_OF_LIGHT, .tileTag = ANIM_TAG_WHITE_CIRCLE_OF_LIGHT,
.paletteTag = ANIM_TAG_WHITE_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_WHITE_CIRCLE_OF_LIGHT,
.oam = &gOamData_AffineDouble_ObjBlend_64x64, .oam = &gOamData_AffineDouble_ObjBlend_64x64,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E7144, .affineAnims = gAffineAnims_LusterPurgeCircle,
.callback = AnimSpriteOnMonPos, .callback = AnimSpriteOnMonPos,
}; };
static const union AffineAnimCmd gUnknown_83E7160[] = static const union AffineAnimCmd sAffineAnim_PsychoBoostOrb_0[] =
{ {
AFFINEANIMCMD_FRAME(0x20, 0x20, 0, 0), AFFINEANIMCMD_FRAME(0x20, 0x20, 0, 0),
AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 17), AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 17),
@@ -392,30 +392,30 @@ static const union AffineAnimCmd gUnknown_83E7160[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_83E71B8[] = static const union AffineAnimCmd sAffineAnim_PsychoBoostOrb_1[] =
{ {
AFFINEANIMCMD_FRAME(-0x14, 0x18, 0, 15), AFFINEANIMCMD_FRAME(-0x14, 0x18, 0, 15),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gUnknown_83E71C8[] = static const union AffineAnimCmd *const sAffineAnims_PsychoBoostOrb[] =
{ {
gUnknown_83E7160, sAffineAnim_PsychoBoostOrb_0,
gUnknown_83E71B8, sAffineAnim_PsychoBoostOrb_1,
}; };
const struct SpriteTemplate gUnknown_83E71D0 = const struct SpriteTemplate gPsychoBoostOrbSpriteTemplate =
{ {
.tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.oam = &gOamData_AffineDouble_ObjBlend_64x64, .oam = &gOamData_AffineDouble_ObjBlend_64x64,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E71C8, .affineAnims = sAffineAnims_PsychoBoostOrb,
.callback = sub_80B3E84, .callback = AnimPsychoBoost,
}; };
static void sub_80B2ECC(struct Sprite *sprite) static void AnimDefensiveWall(struct Sprite *sprite)
{ {
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER || IsContest()) if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER || IsContest())
{ {
@@ -531,7 +531,7 @@ static void sub_80B3168(struct Sprite *sprite)
sprite->callback = DestroyAnimSprite; sprite->callback = DestroyAnimSprite;
} }
static void sub_80B31D0(struct Sprite *sprite) static void AnimWallSparkle(struct Sprite *sprite)
{ {
if (sprite->data[0] == 0) if (sprite->data[0] == 0)
{ {
@@ -568,7 +568,7 @@ static void sub_80B31D0(struct Sprite *sprite)
} }
} }
static void sub_80B3278(struct Sprite *sprite) static void AnimBentSpoon(struct Sprite *sprite)
{ {
sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET); sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
@@ -589,7 +589,7 @@ static void sub_80B3278(struct Sprite *sprite)
sprite->callback = RunStoredCallbackWhenAnimEnds; sprite->callback = RunStoredCallbackWhenAnimEnds;
} }
static void sub_80B32F4(struct Sprite *sprite) static void AnimQuestionMark(struct Sprite *sprite)
{ {
s16 x = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, BATTLER_COORD_ATTR_WIDTH) / 2; s16 x = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, BATTLER_COORD_ATTR_WIDTH) / 2;
s16 y = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, BATTLER_COORD_ATTR_HEIGHT) / -2; s16 y = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, BATTLER_COORD_ATTR_HEIGHT) / -2;
@@ -607,7 +607,7 @@ static void sub_80B32F4(struct Sprite *sprite)
static void sub_80B3384(struct Sprite *sprite) static void sub_80B3384(struct Sprite *sprite)
{ {
sprite->oam.affineMode = ST_OAM_AFFINE_NORMAL; sprite->oam.affineMode = ST_OAM_AFFINE_NORMAL;
sprite->affineAnims = gUnknown_83E6FF0; sprite->affineAnims = sAffineAnims_QuestionMark;
sprite->data[0] = 0; sprite->data[0] = 0;
InitSpriteAffineAnim(sprite); InitSpriteAffineAnim(sprite);
sprite->callback = sub_80B33B8; sprite->callback = sub_80B33B8;
@@ -633,13 +633,13 @@ static void sub_80B33B8(struct Sprite *sprite)
} }
} }
void sub_80B3418(u8 taskId) void AnimTask_MeditateStretchAttacker(u8 taskId)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
task->data[0] = spriteId; task->data[0] = spriteId;
PrepareAffineAnimInTaskData(task, spriteId, gUnknown_83E700C); PrepareAffineAnimInTaskData(task, spriteId, sAffineAnim_MeditateStretchAttacker);
task->func = sub_80B3454; task->func = sub_80B3454;
} }
@@ -649,7 +649,7 @@ static void sub_80B3454(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_80B3480(u8 taskId) void AnimTask_Teleport(u8 taskId)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
@@ -658,7 +658,7 @@ void sub_80B3480(u8 taskId)
task->data[1] = 0; task->data[1] = 0;
task->data[2] = 0; task->data[2] = 0;
task->data[3] = GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER ? 4 : 8; task->data[3] = GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER ? 4 : 8;
PrepareAffineAnimInTaskData(task, task->data[0], gUnknown_83E702C); PrepareAffineAnimInTaskData(task, task->data[0], sAffineAnim_Teleport);
task->func = sub_80B34DC; task->func = sub_80B34DC;
} }
@@ -690,7 +690,7 @@ static void sub_80B34DC(u8 taskId)
} }
} }
void sub_80B3584(u8 taskId) void AnimTask_ImprisonOrbs(u8 taskId)
{ {
u16 var0, var1; u16 var0, var1;
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
@@ -719,7 +719,7 @@ static void sub_80B3618(u8 taskId)
if (++task->data[1] > 8) if (++task->data[1] > 8)
{ {
task->data[1] = 0; task->data[1] = 0;
spriteId = CreateSprite(&gUnknown_83E7044, task->data[13], task->data[14], 0); spriteId = CreateSprite(&sImprisonOrbSpriteTemplate, task->data[13], task->data[14], 0);
task->data[task->data[2] + 8] = spriteId; task->data[task->data[2] + 8] = spriteId;
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
{ {
@@ -782,7 +782,7 @@ static void sub_80B37A4(struct Sprite *sprite)
++sprite->data[1]; ++sprite->data[1];
} }
static void sub_80B37EC(struct Sprite *sprite) static void AnimRedX(struct Sprite *sprite)
{ {
if (gBattleAnimArgs[0] == 0) if (gBattleAnimArgs[0] == 0)
{ {
@@ -793,7 +793,7 @@ static void sub_80B37EC(struct Sprite *sprite)
sprite->callback = sub_80B37A4; sprite->callback = sub_80B37A4;
} }
void sub_80B3834(u8 taskId) void AnimTask_SkillSwap(u8 taskId)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
@@ -850,7 +850,7 @@ static void sub_80B3980(u8 taskId)
if (++task->data[1] > 6) if (++task->data[1] > 6)
{ {
task->data[1] = 0; task->data[1] = 0;
spriteId = CreateSprite(&gUnknown_83E7114, task->data[11], task->data[12], 0); spriteId = CreateSprite(&sSkillSwapOrbSpriteTemplate, task->data[11], task->data[12], 0);
if (spriteId != 64) if (spriteId != 64)
{ {
gSprites[spriteId].data[0] = 16; gSprites[spriteId].data[0] = 16;
@@ -872,7 +872,7 @@ static void sub_80B3980(u8 taskId)
} }
} }
static void sub_80B3A34(struct Sprite *sprite) static void AnimSkillSwapOrb(struct Sprite *sprite)
{ {
if (TranslateAnimHorizontalArc(sprite)) if (TranslateAnimHorizontalArc(sprite))
{ {
@@ -881,7 +881,7 @@ static void sub_80B3A34(struct Sprite *sprite)
} }
} }
void sub_80B3A58(u8 taskId) void AnimTask_ExtrasensoryDistortion(u8 taskId)
{ {
s16 i; s16 i;
u8 yOffset; u8 yOffset;
@@ -969,7 +969,7 @@ static void sub_80B3B78(u8 taskId)
} }
} }
void sub_80B3C78(u8 taskId) void AnimTask_TransparentCloneGrowAndShrink(u8 taskId)
{ {
s16 spriteId; s16 spriteId;
s16 matrixNum; s16 matrixNum;
@@ -1034,7 +1034,7 @@ static void sub_80B3D78(u8 taskId)
} }
} }
static void sub_80B3E84(struct Sprite *sprite) static void AnimPsychoBoost(struct Sprite *sprite)
{ {
switch (sprite->data[0]) switch (sprite->data[0])
{ {
src/rock.c
+89 -89
View File
@@ -6,16 +6,16 @@
#include "trig.h" #include "trig.h"
#include "constants/songs.h" #include "constants/songs.h"
static void sub_80B4634(struct Sprite *sprite); static void AnimFallingRock(struct Sprite *sprite);
static void sub_80B46F8(struct Sprite *sprite); static void AnimRockFragment(struct Sprite *sprite);
static void AnimDirtParticleAcrossScreen(struct Sprite *sprite); static void AnimDirtParticleAcrossScreen(struct Sprite *sprite);
static void AnimRaiseSprite(struct Sprite *sprite); static void AnimRaiseSprite(struct Sprite *sprite);
static void sub_80B4D00(u8 taskId); static void sub_80B4D00(u8 taskId);
static void sub_80B4F78(struct Sprite *sprite); static void AnimRolloutParticle(struct Sprite *sprite);
static void sub_80B4FE4(struct Sprite *sprite); static void AnimRockTomb(struct Sprite *sprite);
static void sub_80B5074(struct Sprite *sprite); static void AnimRockBlastRock(struct Sprite *sprite);
static void sub_80B50A0(struct Sprite *sprite); static void AnimRockScatter(struct Sprite *sprite);
static void sub_80B477C(struct Sprite *sprite); static void AnimParticleInVortex(struct Sprite *sprite);
static void sub_80B46B4(struct Sprite *sprite); static void sub_80B46B4(struct Sprite *sprite);
static void sub_80B47C4(struct Sprite *sprite); static void sub_80B47C4(struct Sprite *sprite);
static void sub_80B490C(u8 taskId); static void sub_80B490C(u8 taskId);
@@ -24,54 +24,54 @@ static u8 sub_80B4FB8(void);
static void sub_80B5024(struct Sprite *sprite); static void sub_80B5024(struct Sprite *sprite);
static void sub_80B50F8(struct Sprite *sprite); static void sub_80B50F8(struct Sprite *sprite);
static const union AnimCmd gUnknown_83E7390[] = static const union AnimCmd sAnim_FlyingRock_0[] =
{ {
ANIMCMD_FRAME(32, 1), ANIMCMD_FRAME(32, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E7398[] = static const union AnimCmd sAnim_FlyingRock_1[] =
{ {
ANIMCMD_FRAME(48, 1), ANIMCMD_FRAME(48, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E73A0[] = static const union AnimCmd sAnim_FlyingRock_2[] =
{ {
ANIMCMD_FRAME(64, 1), ANIMCMD_FRAME(64, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd *const gUnknown_83E73A8[] = static const union AnimCmd *const sAnims_FlyingRock[] =
{ {
gUnknown_83E7390, sAnim_FlyingRock_0,
gUnknown_83E7398, sAnim_FlyingRock_1,
gUnknown_83E73A0, sAnim_FlyingRock_2,
}; };
const struct SpriteTemplate gUnknown_83E73B4 = const struct SpriteTemplate gFallingRockSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ROCKS, .tileTag = ANIM_TAG_ROCKS,
.paletteTag = ANIM_TAG_ROCKS, .paletteTag = ANIM_TAG_ROCKS,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E73A8, .anims = sAnims_FlyingRock,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B4634, .callback = AnimFallingRock,
}; };
const struct SpriteTemplate gUnknown_83E73CC = const struct SpriteTemplate gRockFragmentSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ROCKS, .tileTag = ANIM_TAG_ROCKS,
.paletteTag = ANIM_TAG_ROCKS, .paletteTag = ANIM_TAG_ROCKS,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E73A8, .anims = sAnims_FlyingRock,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B46F8, .callback = AnimRockFragment,
}; };
const struct SpriteTemplate gUnknown_83E73E4 = const struct SpriteTemplate gSwirlingDirtSpriteTemplate =
{ {
.tileTag = ANIM_TAG_MUD_SAND, .tileTag = ANIM_TAG_MUD_SAND,
.paletteTag = ANIM_TAG_MUD_SAND, .paletteTag = ANIM_TAG_MUD_SAND,
@@ -79,10 +79,10 @@ const struct SpriteTemplate gUnknown_83E73E4 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B477C, .callback = AnimParticleInVortex,
}; };
static const union AffineAnimCmd gUnknown_83E73FC[] = static const union AffineAnimCmd sAffineAnim_Whirlpool[] =
{ {
AFFINEANIMCMD_FRAME(0xC0, 0xC0, 0, 0), AFFINEANIMCMD_FRAME(0xC0, 0xC0, 0, 0),
AFFINEANIMCMD_FRAME(0x2, -0x3, 0, 5), AFFINEANIMCMD_FRAME(0x2, -0x3, 0, 5),
@@ -90,34 +90,34 @@ static const union AffineAnimCmd gUnknown_83E73FC[] =
AFFINEANIMCMD_JUMP(1), AFFINEANIMCMD_JUMP(1),
}; };
static const union AffineAnimCmd *const gUnknown_83E741C[] = static const union AffineAnimCmd *const sAffineAnims_Whirlpool[] =
{ {
gUnknown_83E73FC, sAffineAnim_Whirlpool,
}; };
const struct SpriteTemplate gUnknown_83E7420 = const struct SpriteTemplate gWhirlpoolSpriteTemplate =
{ {
.tileTag = ANIM_TAG_WATER_ORB, .tileTag = ANIM_TAG_WATER_ORB,
.paletteTag = ANIM_TAG_WATER_ORB, .paletteTag = ANIM_TAG_WATER_ORB,
.oam = &gOamData_AffineNormal_ObjBlend_16x16, .oam = &gOamData_AffineNormal_ObjBlend_16x16,
.anims = gAnims_WaterMudOrb, .anims = gAnims_WaterMudOrb,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E741C, .affineAnims = sAffineAnims_Whirlpool,
.callback = sub_80B477C, .callback = AnimParticleInVortex,
}; };
const struct SpriteTemplate gUnknown_83E7438 = const struct SpriteTemplate gFireSpinSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SMALL_EMBER, .tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER, .paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E5D48, .anims = gAnims_BasicFire,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B477C, .callback = AnimParticleInVortex,
}; };
const struct SpriteTemplate gUnknown_83E7450 = const struct SpriteTemplate gFlyingSandCrescentSpriteTemplate =
{ {
.tileTag = ANIM_TAG_FLYING_DIRT, .tileTag = ANIM_TAG_FLYING_DIRT,
.paletteTag = ANIM_TAG_FLYING_DIRT, .paletteTag = ANIM_TAG_FLYING_DIRT,
@@ -128,7 +128,7 @@ const struct SpriteTemplate gUnknown_83E7450 =
.callback = AnimDirtParticleAcrossScreen, .callback = AnimDirtParticleAcrossScreen,
}; };
static const struct Subsprite gUnknown_83E7468[] = static const struct Subsprite sFlyingSandSubsprites[] =
{ {
{ {
.x = -16, .x = -16,
@@ -148,77 +148,77 @@ static const struct Subsprite gUnknown_83E7468[] =
}, },
}; };
static const struct SubspriteTable gUnknown_83E7470[] = static const struct SubspriteTable sFlyingSandSubspriteTable[] =
{ {
{ NELEMS(gUnknown_83E7468), gUnknown_83E7468 }, { NELEMS(sFlyingSandSubsprites), sFlyingSandSubsprites },
}; };
static const union AnimCmd gUnknown_83E7478[] = static const union AnimCmd sAnim_BasicRock_0[] =
{ {
ANIMCMD_FRAME(0, 1), ANIMCMD_FRAME(0, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E7480[] = static const union AnimCmd sAnim_BasicRock_1[] =
{ {
ANIMCMD_FRAME(16, 1), ANIMCMD_FRAME(16, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E7488[] = static const union AnimCmd sAnim_WeatherBallRockDown_0[] =
{ {
ANIMCMD_FRAME(32, 1), ANIMCMD_FRAME(32, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E7490[] = static const union AnimCmd sAnim_WeatherBallRockDown_1[] =
{ {
ANIMCMD_FRAME(48, 1), ANIMCMD_FRAME(48, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E7498[] = static const union AnimCmd sAnim_TwisterRock_0[] =
{ {
ANIMCMD_FRAME(64, 1), ANIMCMD_FRAME(64, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gUnknown_83E74A0[] = static const union AnimCmd sAnim_TwisterRock_1[] =
{ {
ANIMCMD_FRAME(80, 1), ANIMCMD_FRAME(80, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd *const gUnknown_83E74A8[] = static const union AnimCmd *const sAnims_BasicRock[] =
{ {
gUnknown_83E7478, sAnim_BasicRock_0,
gUnknown_83E7480, sAnim_BasicRock_1,
}; };
static const union AnimCmd *const gUnknown_83E74B0[] = static const union AnimCmd *const sAnims_WeatherBallRockDown[] =
{ {
gUnknown_83E7488, sAnim_WeatherBallRockDown_0,
gUnknown_83E7490, sAnim_WeatherBallRockDown_1,
}; };
static const union AnimCmd *const gUnknown_83E74B8[] = static const union AnimCmd *const sAnims_TwisterRock[] =
{ {
gUnknown_83E7498, sAnim_TwisterRock_0,
gUnknown_83E74A0, sAnim_TwisterRock_1,
}; };
const struct SpriteTemplate gUnknown_83E74C0 = const struct SpriteTemplate gAncientPowerRockSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ROCKS, .tileTag = ANIM_TAG_ROCKS,
.paletteTag = ANIM_TAG_ROCKS, .paletteTag = ANIM_TAG_ROCKS,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E74A8, .anims = sAnims_BasicRock,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimRaiseSprite, .callback = AnimRaiseSprite,
}; };
const struct SpriteTemplate gUnknown_83E74D8 = const struct SpriteTemplate gRolloutMudSpriteTemplate =
{ {
.tileTag = ANIM_TAG_MUD_SAND, .tileTag = ANIM_TAG_MUD_SAND,
.paletteTag = ANIM_TAG_MUD_SAND, .paletteTag = ANIM_TAG_MUD_SAND,
@@ -226,7 +226,7 @@ const struct SpriteTemplate gUnknown_83E74D8 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B4F78, .callback = AnimRolloutParticle,
}; };
const struct SpriteTemplate gUnknown_83E74F0 = const struct SpriteTemplate gUnknown_83E74F0 =
@@ -237,83 +237,83 @@ const struct SpriteTemplate gUnknown_83E74F0 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B4F78, .callback = AnimRolloutParticle,
}; };
const struct SpriteTemplate gUnknown_83E7508 = const struct SpriteTemplate gRockTombRockSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ROCKS, .tileTag = ANIM_TAG_ROCKS,
.paletteTag = ANIM_TAG_ROCKS, .paletteTag = ANIM_TAG_ROCKS,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E74A8, .anims = sAnims_BasicRock,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80B4FE4, .callback = AnimRockTomb,
}; };
static const union AffineAnimCmd gUnknown_83E7520[] = static const union AffineAnimCmd sAffineAnim_BasicRock_0[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, -5, 5), AFFINEANIMCMD_FRAME(0x0, 0x0, -5, 5),
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
static const union AffineAnimCmd gUnknown_83E7530[] = static const union AffineAnimCmd sAffineAnim_BasicRock_1[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, 5, 5), AFFINEANIMCMD_FRAME(0x0, 0x0, 5, 5),
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
static const union AffineAnimCmd *const gUnknown_83E7540[] = static const union AffineAnimCmd *const sAffineAnims_BasicRock[] =
{ {
gUnknown_83E7520, sAffineAnim_BasicRock_0,
gUnknown_83E7530, sAffineAnim_BasicRock_1,
}; };
const struct SpriteTemplate gUnknown_83E7548 = const struct SpriteTemplate gRockBlastRockSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ROCKS, .tileTag = ANIM_TAG_ROCKS,
.paletteTag = ANIM_TAG_ROCKS, .paletteTag = ANIM_TAG_ROCKS,
.oam = &gOamData_AffineNormal_ObjNormal_32x32, .oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = gUnknown_83E74A8, .anims = sAnims_BasicRock,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E7540, .affineAnims = sAffineAnims_BasicRock,
.callback = sub_80B5074, .callback = AnimRockBlastRock,
}; };
const struct SpriteTemplate gUnknown_83E7560 = const struct SpriteTemplate gRockScatterSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ROCKS, .tileTag = ANIM_TAG_ROCKS,
.paletteTag = ANIM_TAG_ROCKS, .paletteTag = ANIM_TAG_ROCKS,
.oam = &gOamData_AffineNormal_ObjNormal_32x32, .oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = gUnknown_83E74A8, .anims = sAnims_BasicRock,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E7540, .affineAnims = sAffineAnims_BasicRock,
.callback = sub_80B50A0, .callback = AnimRockScatter,
}; };
const struct SpriteTemplate gUnknown_83E7578 = const struct SpriteTemplate gTwisterRockSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ROCKS, .tileTag = ANIM_TAG_ROCKS,
.paletteTag = ANIM_TAG_ROCKS, .paletteTag = ANIM_TAG_ROCKS,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_83E74B8, .anims = sAnims_TwisterRock,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E7540, .affineAnims = sAffineAnims_BasicRock,
.callback = AnimMoveTwisterParticle, .callback = AnimMoveTwisterParticle,
}; };
const struct SpriteTemplate gUnknown_83E7590 = const struct SpriteTemplate gWeatherBallRockDownSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ROCKS, .tileTag = ANIM_TAG_ROCKS,
.paletteTag = ANIM_TAG_ROCKS, .paletteTag = ANIM_TAG_ROCKS,
.oam = &gOamData_AffineNormal_ObjNormal_32x32, .oam = &gOamData_AffineNormal_ObjNormal_32x32,
.anims = gUnknown_83E74B0, .anims = sAnims_WeatherBallRockDown,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E7540, .affineAnims = sAffineAnims_BasicRock,
.callback = AnimWeatherBallDown, .callback = AnimWeatherBallDown,
}; };
static void sub_80B4634(struct Sprite *sprite) static void AnimFallingRock(struct Sprite *sprite)
{ {
if (gBattleAnimArgs[3] != 0) if (gBattleAnimArgs[3] != 0)
SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y); SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
@@ -345,7 +345,7 @@ static void sub_80B46B4(struct Sprite *sprite)
sprite->callback(sprite); sprite->callback(sprite);
} }
static void sub_80B46F8(struct Sprite *sprite) static void AnimRockFragment(struct Sprite *sprite)
{ {
StartSpriteAnim(sprite, gBattleAnimArgs[5]); StartSpriteAnim(sprite, gBattleAnimArgs[5]);
AnimateSprite(sprite); AnimateSprite(sprite);
@@ -366,7 +366,7 @@ static void sub_80B46F8(struct Sprite *sprite)
StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix); StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
} }
static void sub_80B477C(struct Sprite *sprite) static void AnimParticleInVortex(struct Sprite *sprite)
{ {
if (gBattleAnimArgs[6] == 0) if (gBattleAnimArgs[6] == 0)
InitSpritePosToAnimAttacker(sprite, 0); InitSpritePosToAnimAttacker(sprite, 0);
@@ -503,7 +503,7 @@ static void AnimDirtParticleAcrossScreen(struct Sprite *sprite)
sprite->pos1.x = -64; sprite->pos1.x = -64;
} }
sprite->pos1.y = gBattleAnimArgs[0]; sprite->pos1.y = gBattleAnimArgs[0];
SetSubspriteTables(sprite, gUnknown_83E7470); SetSubspriteTables(sprite, sFlyingSandSubspriteTable);
sprite->data[1] = gBattleAnimArgs[1]; sprite->data[1] = gBattleAnimArgs[1];
sprite->data[2] = gBattleAnimArgs[2]; sprite->data[2] = gBattleAnimArgs[2];
++sprite->data[0]; ++sprite->data[0];
@@ -547,7 +547,7 @@ static void AnimRaiseSprite(struct Sprite *sprite)
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
} }
void sub_80B4BD0(u8 taskId) void AnimTask_Rollout(u8 taskId)
{ {
u16 var0, var1, var2, var3; u16 var0, var1, var2, var3;
u8 var4; u8 var4;
@@ -660,7 +660,7 @@ static void sub_80B4E70(struct Task *task)
switch (task->data[1]) switch (task->data[1])
{ {
case 1: case 1:
spriteTemplate = &gUnknown_83E74D8; spriteTemplate = &gRolloutMudSpriteTemplate;
var0 = 0; var0 = 0;
break; break;
case 2: case 2:
@@ -696,7 +696,7 @@ static void sub_80B4E70(struct Task *task)
task->data[12] *= -1; task->data[12] *= -1;
} }
static void sub_80B4F78(struct Sprite *sprite) static void AnimRolloutParticle(struct Sprite *sprite)
{ {
if (TranslateAnimHorizontalArc(sprite)) if (TranslateAnimHorizontalArc(sprite))
{ {
@@ -718,7 +718,7 @@ static u8 sub_80B4FB8(void)
return retVal; return retVal;
} }
static void sub_80B4FE4(struct Sprite *sprite) static void AnimRockTomb(struct Sprite *sprite)
{ {
StartSpriteAnim(sprite, gBattleAnimArgs[4]); StartSpriteAnim(sprite, gBattleAnimArgs[4]);
sprite->pos2.x = gBattleAnimArgs[0]; sprite->pos2.x = gBattleAnimArgs[0];
@@ -749,14 +749,14 @@ static void sub_80B5024(struct Sprite *sprite)
} }
} }
static void sub_80B5074(struct Sprite *sprite) static void AnimRockBlastRock(struct Sprite *sprite)
{ {
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
StartSpriteAffineAnim(sprite, 1); StartSpriteAffineAnim(sprite, 1);
TranslateAnimSpriteToTargetMonLocation(sprite); TranslateAnimSpriteToTargetMonLocation(sprite);
} }
static void sub_80B50A0(struct Sprite *sprite) static void AnimRockScatter(struct Sprite *sprite)
{ {
sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0); sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
@@ -791,7 +791,7 @@ void AnimTask_GetSeismicTossDamageLevel(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_80B5188(u8 taskId) void AnimTask_MoveSeismicTossBg(u8 taskId)
{ {
if (gTasks[taskId].data[0] == 0) if (gTasks[taskId].data[0] == 0)
{ {
@@ -808,7 +808,7 @@ void sub_80B5188(u8 taskId)
++gTasks[taskId].data[0]; ++gTasks[taskId].data[0];
} }
void sub_80B51EC(u8 taskId) void AnimTask_SeismicTossBgAccelerateDownAtEnd(u8 taskId)
{ {
if (gTasks[taskId].data[0] == 0) if (gTasks[taskId].data[0] == 0)
{ {