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

update static declarations

Browse Source
This commit is contained in:
Evan
2019-12-06 22:44:15 -07:00
parent 71f3d258ea
commit cb1e4ab326
9 changed files with 380 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common_syms/battle_anim_special.txt
+1 -1
View File
@@ -1,3 +1,3 @@
gUnknown_3005424 gUnknown_3005424
gUnknown_3005428 gUnknown_3005428
gUnknown_300542C gUnknown_300542C
include/battle_anim.h
+1 -5
View File
@@ -36,9 +36,6 @@ struct BattleAnimBackground
#define ANIM_ARGS_COUNT 8 #define ANIM_ARGS_COUNT 8
#define PAN_SIDE_PLAYER -64
#define PAN_SIDE_OPPONENT 63
extern void (*gAnimScriptCallback)(void); extern void (*gAnimScriptCallback)(void);
extern bool8 gAnimScriptActive; extern bool8 gAnimScriptActive;
extern u8 gAnimVisualTaskCount; extern u8 gAnimVisualTaskCount;
@@ -52,7 +49,6 @@ extern u8 gAnimMoveTurn;
extern u8 gBattleAnimAttacker; extern u8 gBattleAnimAttacker;
extern u8 gBattleAnimTarget; extern u8 gBattleAnimTarget;
extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT]; extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
extern u16 gAnimMovePower;
extern s32 gAnimMoveDmg; extern s32 gAnimMoveDmg;
extern u16 gAnimBattlerSpecies[MAX_BATTLERS_COUNT]; extern u16 gAnimBattlerSpecies[MAX_BATTLERS_COUNT];
extern u8 gUnknown_2037F24; extern u8 gUnknown_2037F24;
@@ -140,7 +136,6 @@ void LaunchBattleAnimation(const u8 *const animsTable[], u16 tableId, bool8 isMo
void DestroyAnimSprite(struct Sprite *sprite); void DestroyAnimSprite(struct Sprite *sprite);
void DestroyAnimVisualTask(u8 taskId); void DestroyAnimVisualTask(u8 taskId);
void DestroyAnimSoundTask(u8 taskId); void DestroyAnimSoundTask(u8 taskId);
bool8 IsAnimBankSpriteVisible(u8 battlerId);
bool8 IsContest(void); bool8 IsContest(void);
s8 BattleAnimAdjustPanning(s8 pan); s8 BattleAnimAdjustPanning(s8 pan);
s8 BattleAnimAdjustPanning2(s8 pan); s8 BattleAnimAdjustPanning2(s8 pan);
@@ -220,6 +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);
// battle_anim_effects_2.c // battle_anim_effects_2.c
void sub_80A6E48(struct Sprite *); void sub_80A6E48(struct Sprite *);
src/battle_anim.c
+10 -11
View File
@@ -59,7 +59,6 @@ static void LoadDefaultBg(void);
static void Task_LoopAndPlaySE(u8 taskId); static void Task_LoopAndPlaySE(u8 taskId);
static void Task_WaitAndPlaySE(u8 taskId); static void Task_WaitAndPlaySE(u8 taskId);
static void sub_807331C(u8 taskId); static void sub_807331C(u8 taskId);
static bool8 sub_807378C(u16 a);
static void ScriptCmd_loadspritegfx(void); static void ScriptCmd_loadspritegfx(void);
static void ScriptCmd_unloadspritegfx(void); static void ScriptCmd_unloadspritegfx(void);
@@ -125,7 +124,6 @@ const struct OamData gOamData_AffineOff_ObjNormal_8x8 =
.paletteNum = 0, .paletteNum = 0,
}; };
const struct OamData gOamData_AffineOff_ObjNormal_16x16 = const struct OamData gOamData_AffineOff_ObjNormal_16x16 =
{ {
.y = 0, .y = 0,
@@ -2082,6 +2080,7 @@ static void ScriptCmd_waitforvisualfinish(void)
static void ScriptCmd_hang1(void) static void ScriptCmd_hang1(void)
{ {
} }
static void ScriptCmd_hang2(void) static void ScriptCmd_hang2(void)
{ {
} }
@@ -3281,7 +3280,7 @@ static void ScriptCmd_visible(void)
static void ScriptCmd_doublebattle_2D(void) static void ScriptCmd_doublebattle_2D(void)
{ {
u8 wantedBattler; u8 wantedBattler;
u8 r4; u8 priority;
u8 spriteId; u8 spriteId;
wantedBattler = sBattleAnimScriptPtr[1]; wantedBattler = sBattleAnimScriptPtr[1];
@@ -3291,21 +3290,21 @@ static void ScriptCmd_doublebattle_2D(void)
{ {
if (wantedBattler == ANIM_ATTACKER) if (wantedBattler == ANIM_ATTACKER)
{ {
r4 = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker); priority = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker);
spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
} }
else else
{ {
r4 = GetBattlerSpriteBGPriorityRank(gBattleAnimTarget); priority = GetBattlerSpriteBGPriorityRank(gBattleAnimTarget);
spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
} }
if (spriteId != 0xFF) if (spriteId != 0xFF)
{ {
gSprites[spriteId].invisible = FALSE; gSprites[spriteId].invisible = FALSE;
if (r4 == 2) if (priority == 2)
gSprites[spriteId].oam.priority = 3; gSprites[spriteId].oam.priority = 3;
if (r4 == 1) if (priority == 1)
sub_8073128(FALSE); sub_8073128(FALSE);
else else
sub_8073128(TRUE); sub_8073128(TRUE);
@@ -3316,7 +3315,7 @@ static void ScriptCmd_doublebattle_2D(void)
static void ScriptCmd_doublebattle_2E(void) static void ScriptCmd_doublebattle_2E(void)
{ {
u8 wantedBattler; u8 wantedBattler;
u8 r4; u8 priority;
u8 spriteId; u8 spriteId;
wantedBattler = sBattleAnimScriptPtr[1]; wantedBattler = sBattleAnimScriptPtr[1];
@@ -3326,16 +3325,16 @@ static void ScriptCmd_doublebattle_2E(void)
{ {
if (wantedBattler == ANIM_ATTACKER) if (wantedBattler == ANIM_ATTACKER)
{ {
r4 = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker); priority = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker);
spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
} }
else else
{ {
r4 = GetBattlerSpriteBGPriorityRank(gBattleAnimTarget); priority = GetBattlerSpriteBGPriorityRank(gBattleAnimTarget);
spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
} }
if (spriteId != 0xFF && r4 == 2) if (spriteId != 0xFF && priority == 2)
gSprites[spriteId].oam.priority = 2; gSprites[spriteId].oam.priority = 2;
} }
} }
src/battle_anim_effects_1.c
+197 -198
View File
File diff suppressed because it is too large Load Diff
src/battle_anim_effects_2.c
+86 -86
View File
@@ -65,7 +65,7 @@ static void AnimPerishSongMusicNote_Step2(struct Sprite *);
// Data // Data
// Unused // Unused
const struct SpriteTemplate gUnknown_83E3ADC = static const struct SpriteTemplate gUnknown_83E3ADC =
{ {
.tileTag = ANIM_TAG_FINGER, .tileTag = ANIM_TAG_FINGER,
.paletteTag = ANIM_TAG_FINGER, .paletteTag = ANIM_TAG_FINGER,
@@ -76,19 +76,19 @@ const struct SpriteTemplate gUnknown_83E3ADC =
.callback = sub_80A6E48, .callback = sub_80A6E48,
}; };
const union AnimCmd gUnknown_83E3AF4[] = static const union AnimCmd gUnknown_83E3AF4[] =
{ {
ANIMCMD_FRAME(4, 1), ANIMCMD_FRAME(4, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gUnknown_83E3AFC[] = static const union AnimCmd *const gUnknown_83E3AFC[] =
{ {
gUnknown_83E3AF4, gUnknown_83E3AF4,
}; };
// Unused // Unused
const struct SpriteTemplate gUnknown_83E3B00 = static const struct SpriteTemplate gUnknown_83E3B00 =
{ {
.tileTag = ANIM_TAG_MUSIC_NOTES, .tileTag = ANIM_TAG_MUSIC_NOTES,
.paletteTag = ANIM_TAG_MUSIC_NOTES, .paletteTag = ANIM_TAG_MUSIC_NOTES,
@@ -100,7 +100,7 @@ const struct SpriteTemplate gUnknown_83E3B00 =
}; };
// Unused // Unused
const struct SpriteTemplate gUnknown_83E3B18 = static const struct SpriteTemplate gUnknown_83E3B18 =
{ {
.tileTag = 0, .tileTag = 0,
.paletteTag = 0, .paletteTag = 0,
@@ -112,7 +112,7 @@ const struct SpriteTemplate gUnknown_83E3B18 =
}; };
// Unused // Unused
const struct SpriteTemplate gUnknown_83E3B30 = static const struct SpriteTemplate gUnknown_83E3B30 =
{ {
.tileTag = ANIM_TAG_CLAMP, .tileTag = ANIM_TAG_CLAMP,
.paletteTag = ANIM_TAG_CLAMP, .paletteTag = ANIM_TAG_CLAMP,
@@ -123,7 +123,7 @@ const struct SpriteTemplate gUnknown_83E3B30 =
.callback = sub_80A7020, .callback = sub_80A7020,
}; };
const union AnimCmd gUnknown_83E3B48[] = static const union AnimCmd gUnknown_83E3B48[] =
{ {
ANIMCMD_FRAME(0, 9), ANIMCMD_FRAME(0, 9),
ANIMCMD_FRAME(16, 3), ANIMCMD_FRAME(16, 3),
@@ -132,25 +132,25 @@ const union AnimCmd gUnknown_83E3B48[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gUnknown_83E3B5C[] = static const union AnimCmd *const gUnknown_83E3B5C[] =
{ {
gUnknown_83E3B48, gUnknown_83E3B48,
}; };
const union AffineAnimCmd gUnknown_83E3B60[] = static const union AffineAnimCmd gUnknown_83E3B60[] =
{ {
AFFINEANIMCMD_FRAME(80, 80, 0, 0), AFFINEANIMCMD_FRAME(80, 80, 0, 0),
AFFINEANIMCMD_FRAME(9, 9, 0, 18), AFFINEANIMCMD_FRAME(9, 9, 0, 18),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd *const gUnknown_83E3B78[] = static const union AffineAnimCmd *const gUnknown_83E3B78[] =
{ {
gUnknown_83E3B60, gUnknown_83E3B60,
}; };
// Unused // Unused
const struct SpriteTemplate gUnknown_83E3B7C = static const struct SpriteTemplate gUnknown_83E3B7C =
{ {
.tileTag = ANIM_TAG_EXPLOSION_6, .tileTag = ANIM_TAG_EXPLOSION_6,
.paletteTag = ANIM_TAG_EXPLOSION_6, .paletteTag = ANIM_TAG_EXPLOSION_6,
@@ -161,7 +161,7 @@ const struct SpriteTemplate gUnknown_83E3B7C =
.callback = AnimSpriteOnMonPos, .callback = AnimSpriteOnMonPos,
}; };
const union AnimCmd gKinesisZapEnergyAnimCmds[] = static const union AnimCmd gKinesisZapEnergyAnimCmds[] =
{ {
ANIMCMD_FRAME(0, 3, .hFlip = TRUE), ANIMCMD_FRAME(0, 3, .hFlip = TRUE),
ANIMCMD_FRAME(8, 3, .hFlip = TRUE), ANIMCMD_FRAME(8, 3, .hFlip = TRUE),
@@ -174,7 +174,7 @@ const union AnimCmd gKinesisZapEnergyAnimCmds[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gKinesisZapEnergyAnimTable[] = static const union AnimCmd *const gKinesisZapEnergyAnimTable[] =
{ {
gKinesisZapEnergyAnimCmds, gKinesisZapEnergyAnimCmds,
}; };
@@ -190,7 +190,7 @@ const struct SpriteTemplate gKinesisZapEnergySpriteTemplate =
.callback = Anim_KinesisZapEnergy, .callback = Anim_KinesisZapEnergy,
}; };
const union AffineAnimCmd gSwordsDanceBladeAffineAnimCmds[] = static const union AffineAnimCmd gSwordsDanceBladeAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(16, 256, 0, 0), AFFINEANIMCMD_FRAME(16, 256, 0, 0),
AFFINEANIMCMD_FRAME(20, 0, 0, 12), AFFINEANIMCMD_FRAME(20, 0, 0, 12),
@@ -198,7 +198,7 @@ const union AffineAnimCmd gSwordsDanceBladeAffineAnimCmds[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd *const gSwordsDanceBladeAffineAnimTable[] = static const union AffineAnimCmd *const gSwordsDanceBladeAffineAnimTable[] =
{ {
gSwordsDanceBladeAffineAnimCmds, gSwordsDanceBladeAffineAnimCmds,
}; };
@@ -236,14 +236,14 @@ const struct SpriteTemplate gAirWaveProjectileSpriteTemplate =
.callback = AnimAirWaveProjectile, .callback = AnimAirWaveProjectile,
}; };
const union AffineAnimCmd gGrowingRingAffineAnimCmds[] = static const union AffineAnimCmd gGrowingRingAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(32, 32, 0, 0), AFFINEANIMCMD_FRAME(32, 32, 0, 0),
AFFINEANIMCMD_FRAME(7, 7, 0, -56), AFFINEANIMCMD_FRAME(7, 7, 0, -56),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd gWaterPulseRingAffineAnimCmds[] = static const union AffineAnimCmd gWaterPulseRingAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(5, 5, 0, 10), AFFINEANIMCMD_FRAME(5, 5, 0, 10),
AFFINEANIMCMD_FRAME(-10, -10, 0, 10), AFFINEANIMCMD_FRAME(-10, -10, 0, 10),
@@ -260,7 +260,7 @@ const union AffineAnimCmd *const gGrowingRingAffineAnimTable[] =
gGrowingRingAffineAnimCmds, gGrowingRingAffineAnimCmds,
}; };
const union AffineAnimCmd *const gWaterPulseRingAffineAnimTable[] = static const union AffineAnimCmd *const gWaterPulseRingAffineAnimTable[] =
{ {
gWaterPulseRingAffineAnimCmds, gWaterPulseRingAffineAnimCmds,
}; };
@@ -331,24 +331,24 @@ const struct SpriteTemplate gUnknown_83E3D18 =
.callback = sub_80A79E8, .callback = sub_80A79E8,
}; };
const union AnimCmd gCoinAnimCmds[] = static const union AnimCmd gCoinAnimCmds[] =
{ {
ANIMCMD_FRAME(8, 1), ANIMCMD_FRAME(8, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gCoinAnimTable[] = static const union AnimCmd *const gCoinAnimTable[] =
{ {
gCoinAnimCmds, gCoinAnimCmds,
}; };
const union AffineAnimCmd gFallingCoinAffineAnimCmds[] = static const union AffineAnimCmd gFallingCoinAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(0, 0, 10, 1), AFFINEANIMCMD_FRAME(0, 0, 10, 1),
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
const union AffineAnimCmd *const gFallingCoinAffineAnimTable[] = static const union AffineAnimCmd *const gFallingCoinAffineAnimTable[] =
{ {
gFallingCoinAffineAnimCmds, gFallingCoinAffineAnimCmds,
}; };
@@ -375,13 +375,13 @@ const struct SpriteTemplate gFallingCoinSpriteTemplate =
.callback = AnimFallingCoin, .callback = AnimFallingCoin,
}; };
const union AffineAnimCmd gBulletSeedAffineAnimCmds[] = static const union AffineAnimCmd gBulletSeedAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(0, 0, 20, 1), AFFINEANIMCMD_FRAME(0, 0, 20, 1),
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
const union AffineAnimCmd *const gBulletSeedAffineAnimTable[] = static const union AffineAnimCmd *const gBulletSeedAffineAnimTable[] =
{ {
gBulletSeedAffineAnimCmds, gBulletSeedAffineAnimCmds,
}; };
@@ -397,14 +397,14 @@ const struct SpriteTemplate gBulletSeedSpriteTemplate =
.callback = AnimBulletSeed, .callback = AnimBulletSeed,
}; };
const union AffineAnimCmd gRazorWindTornadoAffineAnimCmds[] = static const union AffineAnimCmd gRazorWindTornadoAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(16, 256, 0, 0), AFFINEANIMCMD_FRAME(16, 256, 0, 0),
AFFINEANIMCMD_FRAME(4, 0, 0, 40), AFFINEANIMCMD_FRAME(4, 0, 0, 40),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd *const gRazorWindTornadoAffineAnimTable[] = static const union AffineAnimCmd *const gRazorWindTornadoAffineAnimTable[] =
{ {
gRazorWindTornadoAffineAnimCmds, gRazorWindTornadoAffineAnimCmds,
}; };
@@ -420,7 +420,7 @@ const struct SpriteTemplate gRazorWindTornadoSpriteTemplate =
.callback = AnimRazorWindTornado, .callback = AnimRazorWindTornado,
}; };
const union AnimCmd gViceGripAnimCmds1[] = static const union AnimCmd gViceGripAnimCmds1[] =
{ {
ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(0, 3),
ANIMCMD_FRAME(16, 3), ANIMCMD_FRAME(16, 3),
@@ -428,7 +428,7 @@ const union AnimCmd gViceGripAnimCmds1[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gViceGripAnimCmds2[] = static const union AnimCmd gViceGripAnimCmds2[] =
{ {
ANIMCMD_FRAME(0, 3, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_FRAME(0, 3, .vFlip = TRUE, .hFlip = TRUE),
ANIMCMD_FRAME(16, 3, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_FRAME(16, 3, .vFlip = TRUE, .hFlip = TRUE),
@@ -436,7 +436,7 @@ const union AnimCmd gViceGripAnimCmds2[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gViceGripAnimTable[] = static const union AnimCmd *const gViceGripAnimTable[] =
{ {
gViceGripAnimCmds1, gViceGripAnimCmds1,
gViceGripAnimCmds2, gViceGripAnimCmds2,
@@ -453,7 +453,7 @@ const struct SpriteTemplate gViceGripSpriteTemplate =
.callback = AnimViceGripPincer, .callback = AnimViceGripPincer,
}; };
const union AnimCmd gGuillotineAnimCmds1[] = static const union AnimCmd gGuillotineAnimCmds1[] =
{ {
ANIMCMD_FRAME(0, 2), ANIMCMD_FRAME(0, 2),
ANIMCMD_FRAME(16, 2), ANIMCMD_FRAME(16, 2),
@@ -461,7 +461,7 @@ const union AnimCmd gGuillotineAnimCmds1[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gGuillotineAnimCmds2[] = static const union AnimCmd gGuillotineAnimCmds2[] =
{ {
ANIMCMD_FRAME(0, 2, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_FRAME(0, 2, .vFlip = TRUE, .hFlip = TRUE),
ANIMCMD_FRAME(16, 2, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_FRAME(16, 2, .vFlip = TRUE, .hFlip = TRUE),
@@ -469,7 +469,7 @@ const union AnimCmd gGuillotineAnimCmds2[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gGuillotineAnimTable[] = static const union AnimCmd *const gGuillotineAnimTable[] =
{ {
gGuillotineAnimCmds1, gGuillotineAnimCmds1,
gGuillotineAnimCmds2, gGuillotineAnimCmds2,
@@ -486,7 +486,7 @@ const struct SpriteTemplate gGuillotineSpriteTemplate =
.callback = AnimGuillotinePincer, .callback = AnimGuillotinePincer,
}; };
const union AffineAnimCmd gSplashEffectAffineAnimCmds[] = static const union AffineAnimCmd gSplashEffectAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(-6, 4, 0, 8), AFFINEANIMCMD_FRAME(-6, 4, 0, 8),
AFFINEANIMCMD_FRAME(10, -10, 0, 8), AFFINEANIMCMD_FRAME(10, -10, 0, 8),
@@ -494,7 +494,7 @@ const union AffineAnimCmd gSplashEffectAffineAnimCmds[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd gGrowAndShrinkAffineAnimCmds[] = static const union AffineAnimCmd gGrowAndShrinkAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(-4, -5, 0, 12), AFFINEANIMCMD_FRAME(-4, -5, 0, 12),
AFFINEANIMCMD_FRAME(0, 0, 0, 24), AFFINEANIMCMD_FRAME(0, 0, 0, 24),
@@ -502,7 +502,7 @@ const union AffineAnimCmd gGrowAndShrinkAffineAnimCmds[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AnimCmd gBreathPuffAnimCmds1[] = static const union AnimCmd gBreathPuffAnimCmds1[] =
{ {
ANIMCMD_FRAME(0, 4, .hFlip = TRUE), ANIMCMD_FRAME(0, 4, .hFlip = TRUE),
ANIMCMD_FRAME(4, 40, .hFlip = TRUE), ANIMCMD_FRAME(4, 40, .hFlip = TRUE),
@@ -511,7 +511,7 @@ const union AnimCmd gBreathPuffAnimCmds1[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gBreathPuffAnimCmds2[] = static const union AnimCmd gBreathPuffAnimCmds2[] =
{ {
ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(0, 4),
ANIMCMD_FRAME(4, 40), ANIMCMD_FRAME(4, 40),
@@ -520,7 +520,7 @@ const union AnimCmd gBreathPuffAnimCmds2[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gBreathPuffAnimTable[] = static const union AnimCmd *const gBreathPuffAnimTable[] =
{ {
gBreathPuffAnimCmds1, gBreathPuffAnimCmds1,
gBreathPuffAnimCmds2, gBreathPuffAnimCmds2,
@@ -537,14 +537,14 @@ const struct SpriteTemplate gBreathPuffSpriteTemplate =
.callback = AnimBreathPuff, .callback = AnimBreathPuff,
}; };
const union AffineAnimCmd gAngerMarkAffineAnimCmds[] = static const union AffineAnimCmd gAngerMarkAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(11, 11, 0, 8), AFFINEANIMCMD_FRAME(11, 11, 0, 8),
AFFINEANIMCMD_FRAME(-11, -11, 0, 8), AFFINEANIMCMD_FRAME(-11, -11, 0, 8),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd *const gAngerMarkAffineAnimTable[] = static const union AffineAnimCmd *const gAngerMarkAffineAnimTable[] =
{ {
gAngerMarkAffineAnimCmds, gAngerMarkAffineAnimCmds,
}; };
@@ -560,7 +560,7 @@ const struct SpriteTemplate gAngerMarkSpriteTemplate =
.callback = AnimAngerMark, .callback = AnimAngerMark,
}; };
const union AffineAnimCmd gThrashMoveMonAffineAnimCmds[] = static const union AffineAnimCmd gThrashMoveMonAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(-10, 9, 0, 7), AFFINEANIMCMD_FRAME(-10, 9, 0, 7),
AFFINEANIMCMD_FRAME(20, -20, 0, 7), AFFINEANIMCMD_FRAME(20, -20, 0, 7),
@@ -592,7 +592,7 @@ const struct SpriteTemplate gSnoreZSpriteTemplate =
.callback = AnimSnoreZ, .callback = AnimSnoreZ,
}; };
const union AnimCmd gExplosionAnimCmds[] = static const union AnimCmd gExplosionAnimCmds[] =
{ {
ANIMCMD_FRAME(0, 5), ANIMCMD_FRAME(0, 5),
ANIMCMD_FRAME(16, 5), ANIMCMD_FRAME(16, 5),
@@ -601,7 +601,7 @@ const union AnimCmd gExplosionAnimCmds[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gExplosionAnimTable[] = static const union AnimCmd *const gExplosionAnimTable[] =
{ {
gExplosionAnimCmds, gExplosionAnimCmds,
}; };
@@ -617,7 +617,7 @@ const struct SpriteTemplate gExplosionSpriteTemplate =
.callback = AnimSpriteOnMonPos, .callback = AnimSpriteOnMonPos,
}; };
const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds1[] = static const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds1[] =
{ {
AFFINEANIMCMD_FRAME(0, 0, -8, 2), AFFINEANIMCMD_FRAME(0, 0, -8, 2),
AFFINEANIMCMD_FRAME(0, 0, 8, 4), AFFINEANIMCMD_FRAME(0, 0, 8, 4),
@@ -625,13 +625,13 @@ const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds1[] =
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds2[] = static const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds2[] =
{ {
AFFINEANIMCMD_FRAME(256, 256, 0, 0), AFFINEANIMCMD_FRAME(256, 256, 0, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds3[] = static const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds3[] =
{ {
AFFINEANIMCMD_FRAME(-8, 4, 0, 8), AFFINEANIMCMD_FRAME(-8, 4, 0, 8),
AFFINEANIMCMD_LOOP(0), AFFINEANIMCMD_LOOP(0),
@@ -643,7 +643,7 @@ const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds3[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd *const gSoftBoiledEggAffineAnimTable[] = static const union AffineAnimCmd *const gSoftBoiledEggAffineAnimTable[] =
{ {
gSoftBoiledEggAffineAnimCmds1, gSoftBoiledEggAffineAnimCmds1,
gSoftBoiledEggAffineAnimCmds2, gSoftBoiledEggAffineAnimCmds2,
@@ -661,34 +661,34 @@ const struct SpriteTemplate gSoftBoiledEggSpriteTemplate =
.callback = AnimSoftBoiledEgg, .callback = AnimSoftBoiledEgg,
}; };
const union AffineAnimCmd gThinRingExpandingAffineAnimCmds1[] = static const union AffineAnimCmd gThinRingExpandingAffineAnimCmds1[] =
{ {
AFFINEANIMCMD_FRAME(16, 16, 0, 0), AFFINEANIMCMD_FRAME(16, 16, 0, 0),
AFFINEANIMCMD_FRAME(16, 16, 0, 30), AFFINEANIMCMD_FRAME(16, 16, 0, 30),
AFFINEANIMCMD_END_ALT(1), AFFINEANIMCMD_END_ALT(1),
}; };
const union AffineAnimCmd gThinRingExpandingAffineAnimCmds2[] = static const union AffineAnimCmd gThinRingExpandingAffineAnimCmds2[] =
{ {
AFFINEANIMCMD_FRAME(16, 16, 0, 0), AFFINEANIMCMD_FRAME(16, 16, 0, 0),
AFFINEANIMCMD_FRAME(32, 32, 0, 15), AFFINEANIMCMD_FRAME(32, 32, 0, 15),
AFFINEANIMCMD_END_ALT(1), AFFINEANIMCMD_END_ALT(1),
}; };
const union AffineAnimCmd gHyperVoiceRingAffineAnimCmds[] = static const union AffineAnimCmd gHyperVoiceRingAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(16, 16, 0, 0), AFFINEANIMCMD_FRAME(16, 16, 0, 0),
AFFINEANIMCMD_FRAME(11, 11, 0, 45), AFFINEANIMCMD_FRAME(11, 11, 0, 45),
AFFINEANIMCMD_END_ALT(1), AFFINEANIMCMD_END_ALT(1),
}; };
const union AffineAnimCmd *const gThinRingExpandingAffineAnimTable[] = static const union AffineAnimCmd *const gThinRingExpandingAffineAnimTable[] =
{ {
gThinRingExpandingAffineAnimCmds1, gThinRingExpandingAffineAnimCmds1,
gThinRingExpandingAffineAnimCmds2, gThinRingExpandingAffineAnimCmds2,
}; };
const union AffineAnimCmd *const gHyperVoiceRingAffineAnimTable[] = static const union AffineAnimCmd *const gHyperVoiceRingAffineAnimTable[] =
{ {
gHyperVoiceRingAffineAnimCmds, gHyperVoiceRingAffineAnimCmds,
}; };
@@ -704,14 +704,14 @@ const struct SpriteTemplate gThinRingExpandingSpriteTemplate =
.callback = AnimSpriteOnMonPos, .callback = AnimSpriteOnMonPos,
}; };
const union AffineAnimCmd gThinRingShrinkingAffineAnimCmds[] = static const union AffineAnimCmd gThinRingShrinkingAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(512, 512, 0, 0), AFFINEANIMCMD_FRAME(512, 512, 0, 0),
AFFINEANIMCMD_FRAME(-16, -16, 0, 30), AFFINEANIMCMD_FRAME(-16, -16, 0, 30),
AFFINEANIMCMD_END_ALT(1), AFFINEANIMCMD_END_ALT(1),
}; };
const union AffineAnimCmd *const gThinRingShrinkingAffineAnimTable[] = static const union AffineAnimCmd *const gThinRingShrinkingAffineAnimTable[] =
{ {
gThinRingShrinkingAffineAnimCmds, gThinRingShrinkingAffineAnimCmds,
}; };
@@ -760,13 +760,13 @@ const struct SpriteTemplate gUproarRingSpriteTemplate =
.callback = AnimUproarRing, .callback = AnimUproarRing,
}; };
const union AffineAnimCmd gStretchAttackerAffineAnimCmds[] = static const union AffineAnimCmd gStretchAttackerAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(96, -13, 0, 8), AFFINEANIMCMD_FRAME(96, -13, 0, 8),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AnimCmd gSpeedDustAnimCmds[] = static const union AnimCmd gSpeedDustAnimCmds[] =
{ {
ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(0, 3),
ANIMCMD_FRAME(4, 3), ANIMCMD_FRAME(4, 3),
@@ -776,7 +776,7 @@ const union AnimCmd gSpeedDustAnimCmds[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gSpeedDustAnimTable[] = static const union AnimCmd *const gSpeedDustAnimTable[] =
{ {
gSpeedDustAnimCmds, gSpeedDustAnimCmds,
}; };
@@ -800,7 +800,7 @@ const s8 gSpeedDustPosTable[][2] =
{-10, 28}, {-10, 28},
}; };
const union AnimCmd gBellAnimCmds[] = static const union AnimCmd gBellAnimCmds[] =
{ {
ANIMCMD_FRAME(0, 6), ANIMCMD_FRAME(0, 6),
ANIMCMD_FRAME(16, 6), ANIMCMD_FRAME(16, 6),
@@ -818,7 +818,7 @@ const union AnimCmd gBellAnimCmds[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gBellAnimTable[] = static const union AnimCmd *const gBellAnimTable[] =
{ {
gBellAnimCmds, gBellAnimCmds,
}; };
@@ -863,7 +863,7 @@ const struct SpriteTemplate gMagentaHeartSpriteTemplate =
.callback = AnimMagentaHeart, .callback = AnimMagentaHeart,
}; };
const union AffineAnimCmd gUnknown_83E4200[] = static const union AffineAnimCmd gUnknown_83E4200[] =
{ {
AFFINEANIMCMD_FRAME(10, -13, 0, 10), AFFINEANIMCMD_FRAME(10, -13, 0, 10),
AFFINEANIMCMD_FRAME(-10, 13, 0, 10), AFFINEANIMCMD_FRAME(-10, 13, 0, 10),
@@ -903,14 +903,14 @@ const struct SpriteTemplate gRedHeartRisingSpriteTemplate =
.callback = AnimRedHeartRising, .callback = AnimRedHeartRising,
}; };
const union AffineAnimCmd gHiddenPowerOrbAffineAnimCmds[] = static const union AffineAnimCmd gHiddenPowerOrbAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(128, 128, 0, 0), AFFINEANIMCMD_FRAME(128, 128, 0, 0),
AFFINEANIMCMD_FRAME(8, 8, 0, 1), AFFINEANIMCMD_FRAME(8, 8, 0, 1),
AFFINEANIMCMD_JUMP(1), AFFINEANIMCMD_JUMP(1),
}; };
const union AffineAnimCmd *const gHiddenPowerOrbAffineAnimTable[] = static const union AffineAnimCmd *const gHiddenPowerOrbAffineAnimTable[] =
{ {
gHiddenPowerOrbAffineAnimCmds, gHiddenPowerOrbAffineAnimCmds,
}; };
@@ -937,14 +937,14 @@ const struct SpriteTemplate gHiddenPowerOrbScatterSpriteTemplate =
.callback = AnimOrbitScatter, .callback = AnimOrbitScatter,
}; };
const union AffineAnimCmd gSpitUpOrbAffineAnimCmds[] = static const union AffineAnimCmd gSpitUpOrbAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(128, 128, 0, 0), AFFINEANIMCMD_FRAME(128, 128, 0, 0),
AFFINEANIMCMD_FRAME(8, 8, 0, 1), AFFINEANIMCMD_FRAME(8, 8, 0, 1),
AFFINEANIMCMD_JUMP(1), AFFINEANIMCMD_JUMP(1),
}; };
const union AffineAnimCmd *const gSpitUpOrbAffineAnimTable[] = static const union AffineAnimCmd *const gSpitUpOrbAffineAnimTable[] =
{ {
gSpitUpOrbAffineAnimCmds, gSpitUpOrbAffineAnimCmds,
}; };
@@ -960,7 +960,7 @@ const struct SpriteTemplate gSpitUpOrbSpriteTemplate =
.callback = AnimSpitUpOrb, .callback = AnimSpitUpOrb,
}; };
const union AnimCmd gEyeSparkleAnimCmds[] = static const union AnimCmd gEyeSparkleAnimCmds[] =
{ {
ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(0, 4),
ANIMCMD_FRAME(4, 4), ANIMCMD_FRAME(4, 4),
@@ -970,7 +970,7 @@ const union AnimCmd gEyeSparkleAnimCmds[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gEyeSparkleAnimTable[] = static const union AnimCmd *const gEyeSparkleAnimTable[] =
{ {
gEyeSparkleAnimCmds, gEyeSparkleAnimCmds,
}; };
@@ -986,13 +986,13 @@ const struct SpriteTemplate gEyeSparkleSpriteTemplate =
.callback = AnimEyeSparkle, .callback = AnimEyeSparkle,
}; };
const union AnimCmd gAngelSpriteAnimCmds[] = static const union AnimCmd gAngelSpriteAnimCmds[] =
{ {
ANIMCMD_FRAME(0, 24), ANIMCMD_FRAME(0, 24),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gAngelSpriteAnimTable[] = static const union AnimCmd *const gAngelSpriteAnimTable[] =
{ {
gAngelSpriteAnimCmds, gAngelSpriteAnimCmds,
}; };
@@ -1019,19 +1019,19 @@ const struct SpriteTemplate gPinkHeartSpriteTemplate =
.callback = AnimPinkHeart, .callback = AnimPinkHeart,
}; };
const union AnimCmd gDevilAnimCmds1[] = static const union AnimCmd gDevilAnimCmds1[] =
{ {
ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(0, 3),
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
const union AnimCmd gDevilAnimCmds2[] = static const union AnimCmd gDevilAnimCmds2[] =
{ {
ANIMCMD_FRAME(16, 3), ANIMCMD_FRAME(16, 3),
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
const union AnimCmd *const gDevilAnimTable[] = static const union AnimCmd *const gDevilAnimTable[] =
{ {
gDevilAnimCmds1, gDevilAnimCmds1,
gDevilAnimCmds2, gDevilAnimCmds2,
@@ -1048,7 +1048,7 @@ const struct SpriteTemplate gDevilSpriteTemplate =
.callback = AnimDevil, .callback = AnimDevil,
}; };
const union AnimCmd gUnknown_08593B08[] = static const union AnimCmd gUnknown_08593B08[] =
{ {
ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(0, 4),
ANIMCMD_FRAME(16, 4), ANIMCMD_FRAME(16, 4),
@@ -1057,7 +1057,7 @@ const union AnimCmd gUnknown_08593B08[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gUnknown_08593B1C[] = static const union AnimCmd gUnknown_08593B1C[] =
{ {
ANIMCMD_FRAME(0, 4, .hFlip = TRUE), ANIMCMD_FRAME(0, 4, .hFlip = TRUE),
ANIMCMD_FRAME(16, 4, .hFlip = TRUE), ANIMCMD_FRAME(16, 4, .hFlip = TRUE),
@@ -1066,7 +1066,7 @@ const union AnimCmd gUnknown_08593B1C[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gFurySwipesAnimTable[] = static const union AnimCmd *const gFurySwipesAnimTable[] =
{ {
gUnknown_08593B08, gUnknown_08593B08,
gUnknown_08593B1C, gUnknown_08593B1C,
@@ -1083,7 +1083,7 @@ const struct SpriteTemplate gFurySwipesSpriteTemplate =
.callback = AnimFurySwipes, .callback = AnimFurySwipes,
}; };
const union AnimCmd gMovementWavesAnimCmds1[] = static const union AnimCmd gMovementWavesAnimCmds1[] =
{ {
ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(0, 8),
ANIMCMD_FRAME(16, 8), ANIMCMD_FRAME(16, 8),
@@ -1092,7 +1092,7 @@ const union AnimCmd gMovementWavesAnimCmds1[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gMovementWavesAnimCmds2[] = static const union AnimCmd gMovementWavesAnimCmds2[] =
{ {
ANIMCMD_FRAME(16, 8, .hFlip = TRUE), ANIMCMD_FRAME(16, 8, .hFlip = TRUE),
ANIMCMD_FRAME(32, 8, .hFlip = TRUE), ANIMCMD_FRAME(32, 8, .hFlip = TRUE),
@@ -1101,7 +1101,7 @@ const union AnimCmd gMovementWavesAnimCmds2[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gMovementWavesAnimTable[] = static const union AnimCmd *const gMovementWavesAnimTable[] =
{ {
gMovementWavesAnimCmds1, gMovementWavesAnimCmds1,
gMovementWavesAnimCmds2, gMovementWavesAnimCmds2,
@@ -1118,7 +1118,7 @@ const struct SpriteTemplate gMovementWavesSpriteTemplate =
.callback = AnimMovementWaves, .callback = AnimMovementWaves,
}; };
const union AffineAnimCmd gUnknown_08593B98[] = static const union AffineAnimCmd gUnknown_08593B98[] =
{ {
AFFINEANIMCMD_FRAME(-12, 8, 0, 4), AFFINEANIMCMD_FRAME(-12, 8, 0, 4),
AFFINEANIMCMD_FRAME(20, -20, 0, 4), AFFINEANIMCMD_FRAME(20, -20, 0, 4),
@@ -1137,25 +1137,25 @@ const struct SpriteTemplate gJaggedMusicNoteSpriteTemplate =
.callback = AnimJaggedMusicNote, .callback = AnimJaggedMusicNote,
}; };
const union AffineAnimCmd gPerishSongMusicNoteAffineAnimCmds1[] = static const union AffineAnimCmd gPerishSongMusicNoteAffineAnimCmds1[] =
{ {
AFFINEANIMCMD_FRAME(0, 0, 0, 5), AFFINEANIMCMD_FRAME(0, 0, 0, 5),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd gPerishSongMusicNoteAffineAnimCmds2[] = static const union AffineAnimCmd gPerishSongMusicNoteAffineAnimCmds2[] =
{ {
AFFINEANIMCMD_FRAME(0, 0, -8, 16), AFFINEANIMCMD_FRAME(0, 0, -8, 16),
AFFINEANIMCMD_END_ALT(1), AFFINEANIMCMD_END_ALT(1),
}; };
const union AffineAnimCmd gPerishSongMusicNoteAffineAnimCmds3[] = static const union AffineAnimCmd gPerishSongMusicNoteAffineAnimCmds3[] =
{ {
AFFINEANIMCMD_FRAME(0, 0, 8, 16), AFFINEANIMCMD_FRAME(0, 0, 8, 16),
AFFINEANIMCMD_END_ALT(1), AFFINEANIMCMD_END_ALT(1),
}; };
const union AffineAnimCmd *const gPerishSongMusicNoteAffineAnimTable[] = static const union AffineAnimCmd *const gPerishSongMusicNoteAffineAnimTable[] =
{ {
gPerishSongMusicNoteAffineAnimCmds1, gPerishSongMusicNoteAffineAnimCmds1,
gPerishSongMusicNoteAffineAnimCmds2, gPerishSongMusicNoteAffineAnimCmds2,
@@ -1184,19 +1184,19 @@ const struct SpriteTemplate gPerishSongMusicNote2SpriteTemplate =
.callback = AnimPerishSongMusicNote2, .callback = AnimPerishSongMusicNote2,
}; };
const union AffineAnimCmd gGuardRingAffineAnimCmds1[] = static const union AffineAnimCmd gGuardRingAffineAnimCmds1[] =
{ {
AFFINEANIMCMD_FRAME(256, 256, 0, 0), AFFINEANIMCMD_FRAME(256, 256, 0, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd gGuardRingAffineAnimCmds2[] = static const union AffineAnimCmd gGuardRingAffineAnimCmds2[] =
{ {
AFFINEANIMCMD_FRAME(512, 256, 0, 0), AFFINEANIMCMD_FRAME(512, 256, 0, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd *const gGuardRingAffineAnimTable[] = static const union AffineAnimCmd *const gGuardRingAffineAnimTable[] =
{ {
gGuardRingAffineAnimCmds1, gGuardRingAffineAnimCmds1,
gGuardRingAffineAnimCmds2, gGuardRingAffineAnimCmds2,
@@ -1788,7 +1788,7 @@ static void AnimBulletSeed_Step1(struct Sprite *sprite)
u16 rand; u16 rand;
s16* ptr; s16* ptr;
PlaySE12WithPanning(SE_W030, BattleAnimAdjustPanning(63)); PlaySE12WithPanning(SE_W030, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
sprite->pos1.x += sprite->pos2.x; sprite->pos1.x += sprite->pos2.x;
sprite->pos1.y += sprite->pos2.y; sprite->pos1.y += sprite->pos2.y;
sprite->pos2.y = 0; sprite->pos2.y = 0;
@@ -2621,7 +2621,7 @@ void AnimHyperVoiceRing(struct Sprite *sprite)
sp1 = GetBattlerSpriteCoord(battler2, sp4); sp1 = GetBattlerSpriteCoord(battler2, sp4);
} }
if (GetBattlerSide(battler2)) if (GetBattlerSide(battler2) != B_SIDE_PLAYER)
sp0 += gBattleAnimArgs[3]; sp0 += gBattleAnimArgs[3];
else else
sp0 -= gBattleAnimArgs[3]; sp0 -= gBattleAnimArgs[3];
src/battle_anim_effects_3.c
+71 -71
View File
@@ -79,7 +79,7 @@ static void AnimRecycleStep(struct Sprite *);
static void AnimTask_SlackOffSquishStep(u8); static void AnimTask_SlackOffSquishStep(u8);
// Data // Data
const union AnimCmd gScratchAnimCmds[] = static const union AnimCmd gScratchAnimCmds[] =
{ {
ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(0, 4),
ANIMCMD_FRAME(16, 4), ANIMCMD_FRAME(16, 4),
@@ -89,7 +89,7 @@ const union AnimCmd gScratchAnimCmds[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gScratchAnimTable[] = static const union AnimCmd *const gScratchAnimTable[] =
{ {
gScratchAnimCmds, gScratchAnimCmds,
}; };
@@ -127,7 +127,7 @@ const struct SpriteTemplate gBlackBallSpriteTemplate =
.callback = AnimThrowProjectile, .callback = AnimThrowProjectile,
}; };
const union AnimCmd gOpeningEyeAnimCmds[] = static const union AnimCmd gOpeningEyeAnimCmds[] =
{ {
ANIMCMD_FRAME(0, 40), ANIMCMD_FRAME(0, 40),
ANIMCMD_FRAME(16, 8), ANIMCMD_FRAME(16, 8),
@@ -135,7 +135,7 @@ const union AnimCmd gOpeningEyeAnimCmds[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gOpeningEyeAnimTable[] = static const union AnimCmd *const gOpeningEyeAnimTable[] =
{ {
gOpeningEyeAnimCmds, gOpeningEyeAnimCmds,
}; };
@@ -173,7 +173,7 @@ const struct SpriteTemplate gTealAlertSpriteTemplate =
.callback = AnimTealAlert, .callback = AnimTealAlert,
}; };
const union AffineAnimCmd gMeanLookEyeAffineAnimCmds1[] = static const union AffineAnimCmd gMeanLookEyeAffineAnimCmds1[] =
{ {
AFFINEANIMCMD_FRAME(0x180, 0x180, 0, 0), AFFINEANIMCMD_FRAME(0x180, 0x180, 0, 0),
AFFINEANIMCMD_FRAME(-0x20, 0x18, 0, 5), AFFINEANIMCMD_FRAME(-0x20, 0x18, 0, 5),
@@ -181,14 +181,14 @@ const union AffineAnimCmd gMeanLookEyeAffineAnimCmds1[] =
AFFINEANIMCMD_JUMP(1), AFFINEANIMCMD_JUMP(1),
}; };
const union AffineAnimCmd gMeanLookEyeAffineAnimCmds2[] = static const union AffineAnimCmd gMeanLookEyeAffineAnimCmds2[] =
{ {
AFFINEANIMCMD_FRAME(0x30, 0x30, 0, 0), AFFINEANIMCMD_FRAME(0x30, 0x30, 0, 0),
AFFINEANIMCMD_FRAME(0x20, 0x20, 0, 6), AFFINEANIMCMD_FRAME(0x20, 0x20, 0, 6),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd *const gMeanLookEyeAffineAnimTable[] = static const union AffineAnimCmd *const gMeanLookEyeAffineAnimTable[] =
{ {
gMeanLookEyeAffineAnimCmds1, gMeanLookEyeAffineAnimCmds1,
gMeanLookEyeAffineAnimCmds2, gMeanLookEyeAffineAnimCmds2,
@@ -216,7 +216,7 @@ const struct SpriteTemplate gSpikesSpriteTemplate =
.callback = AnimSpikes, .callback = AnimSpikes,
}; };
const union AnimCmd gLeerAnimCmds[] = static const union AnimCmd gLeerAnimCmds[] =
{ {
ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(0, 3),
ANIMCMD_FRAME(16, 3), ANIMCMD_FRAME(16, 3),
@@ -226,7 +226,7 @@ const union AnimCmd gLeerAnimCmds[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gLeerAnimTable[] = static const union AnimCmd *const gLeerAnimTable[] =
{ {
gLeerAnimCmds, gLeerAnimCmds,
}; };
@@ -242,25 +242,25 @@ const struct SpriteTemplate gLeerSpriteTemplate =
.callback = AnimLeer, .callback = AnimLeer,
}; };
const union AnimCmd gLetterZAnimCmds[] = static const union AnimCmd gLetterZAnimCmds[] =
{ {
ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(0, 3),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gLetterZAnimTable[] = static const union AnimCmd *const gLetterZAnimTable[] =
{ {
gLetterZAnimCmds, gLetterZAnimCmds,
}; };
const union AffineAnimCmd gLetterZAffineAnimCmds[] = static const union AffineAnimCmd gLetterZAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(-7, -7, -3, 16), AFFINEANIMCMD_FRAME(-7, -7, -3, 16),
AFFINEANIMCMD_FRAME(7, 7, 3, 16), AFFINEANIMCMD_FRAME(7, 7, 3, 16),
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
const union AffineAnimCmd *const gLetterZAffineAnimTable[] = static const union AffineAnimCmd *const gLetterZAffineAnimTable[] =
{ {
gLetterZAffineAnimCmds, gLetterZAffineAnimCmds,
}; };
@@ -276,7 +276,7 @@ const struct SpriteTemplate gLetterZSpriteTemplate =
.callback = AnimLetterZ, .callback = AnimLetterZ,
}; };
const union AnimCmd gFangAnimCmds[] = static const union AnimCmd gFangAnimCmds[] =
{ {
ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(0, 8),
ANIMCMD_FRAME(16, 16), ANIMCMD_FRAME(16, 16),
@@ -285,19 +285,19 @@ const union AnimCmd gFangAnimCmds[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gFangAnimTable[] = static const union AnimCmd *const gFangAnimTable[] =
{ {
gFangAnimCmds, gFangAnimCmds,
}; };
const union AffineAnimCmd gFangAffineAnimCmds[] = static const union AffineAnimCmd gFangAffineAnimCmds[] =
{ {
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,
}; };
const union AffineAnimCmd *const gFangAffineAnimTable[] = static const union AffineAnimCmd *const gFangAffineAnimTable[] =
{ {
gFangAffineAnimCmds, gFangAffineAnimCmds,
}; };
@@ -313,21 +313,21 @@ const struct SpriteTemplate gFangSpriteTemplate =
.callback = AnimFang, .callback = AnimFang,
}; };
const union AffineAnimCmd gSpotlightAffineAnimCmds1[] = static const union AffineAnimCmd gSpotlightAffineAnimCmds1[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x180, 0, 0), AFFINEANIMCMD_FRAME(0x0, 0x180, 0, 0),
AFFINEANIMCMD_FRAME(0x10, 0x0, 0, 20), AFFINEANIMCMD_FRAME(0x10, 0x0, 0, 20),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd gSpotlightAffineAnimCmds2[] = static const union AffineAnimCmd gSpotlightAffineAnimCmds2[] =
{ {
AFFINEANIMCMD_FRAME(0x140, 0x180, 0, 0), AFFINEANIMCMD_FRAME(0x140, 0x180, 0, 0),
AFFINEANIMCMD_FRAME(-0x10, 0x0, 0, 19), AFFINEANIMCMD_FRAME(-0x10, 0x0, 0, 19),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd *const gSpotlightAffineAnimTable[] = static const union AffineAnimCmd *const gSpotlightAffineAnimTable[] =
{ {
gSpotlightAffineAnimCmds1, gSpotlightAffineAnimCmds1,
gSpotlightAffineAnimCmds2, gSpotlightAffineAnimCmds2,
@@ -366,7 +366,7 @@ const struct SpriteTemplate gClappingHand2SpriteTemplate =
.callback = AnimClappingHand2, .callback = AnimClappingHand2,
}; };
const union AnimCmd gRapidSpinAnimCmds[] = static const union AnimCmd gRapidSpinAnimCmds[] =
{ {
ANIMCMD_FRAME(0, 2), ANIMCMD_FRAME(0, 2),
ANIMCMD_FRAME(8, 2), ANIMCMD_FRAME(8, 2),
@@ -374,7 +374,7 @@ const union AnimCmd gRapidSpinAnimCmds[] =
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
const union AnimCmd *const gRapidSpinAnimTable[] = static const union AnimCmd *const gRapidSpinAnimTable[] =
{ {
gRapidSpinAnimCmds, gRapidSpinAnimCmds,
}; };
@@ -390,7 +390,7 @@ const struct SpriteTemplate gRapidSpinSpriteTemplate =
.callback = AnimRapidSpin, .callback = AnimRapidSpin,
}; };
const union AffineAnimCmd gUnknown_83FF080[] = static const union AffineAnimCmd gUnknown_83FF080[] =
{ {
AFFINEANIMCMD_FRAME(-12, 8, 0, 4), AFFINEANIMCMD_FRAME(-12, 8, 0, 4),
AFFINEANIMCMD_FRAME(20, -20, 0, 4), AFFINEANIMCMD_FRAME(20, -20, 0, 4),
@@ -398,18 +398,18 @@ const union AffineAnimCmd gUnknown_83FF080[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AnimCmd gTriAttackTriangleAnimCmds[] = static const union AnimCmd gTriAttackTriangleAnimCmds[] =
{ {
ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(0, 8),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gTriAttackTriangleAnimTable[] = static const union AnimCmd *const gTriAttackTriangleAnimTable[] =
{ {
gTriAttackTriangleAnimCmds, gTriAttackTriangleAnimCmds,
}; };
const union AffineAnimCmd gTriAttackTriangleAffineAnimCmds[] = static const union AffineAnimCmd gTriAttackTriangleAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(0, 0, 5, 40), AFFINEANIMCMD_FRAME(0, 0, 5, 40),
AFFINEANIMCMD_FRAME(0, 0, 10, 10), AFFINEANIMCMD_FRAME(0, 0, 10, 10),
@@ -418,7 +418,7 @@ const union AffineAnimCmd gTriAttackTriangleAffineAnimCmds[] =
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
const union AffineAnimCmd *const gTriAttackTriangleAffineAnimTable[] = static const union AffineAnimCmd *const gTriAttackTriangleAffineAnimTable[] =
{ {
gTriAttackTriangleAffineAnimCmds, gTriAttackTriangleAffineAnimCmds,
}; };
@@ -434,7 +434,7 @@ const struct SpriteTemplate gTriAttackTriangleSpriteTemplate =
.callback = AnimTriAttackTriangle, .callback = AnimTriAttackTriangle,
}; };
const union AnimCmd gEclipsingOrbAnimCmds[] = static const union AnimCmd gEclipsingOrbAnimCmds[] =
{ {
ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(0, 3),
ANIMCMD_FRAME(16, 3), ANIMCMD_FRAME(16, 3),
@@ -447,7 +447,7 @@ const union AnimCmd gEclipsingOrbAnimCmds[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gEclipsingOrbAnimTable[] = static const union AnimCmd *const gEclipsingOrbAnimTable[] =
{ {
gEclipsingOrbAnimCmds, gEclipsingOrbAnimCmds,
}; };
@@ -463,7 +463,7 @@ const struct SpriteTemplate gEclipsingOrbSpriteTemplate =
.callback = AnimSpriteOnMonPos, .callback = AnimSpriteOnMonPos,
}; };
const union AffineAnimCmd DefenseCurlDeformMonAffineAnimCmds[] = static const union AffineAnimCmd DefenseCurlDeformMonAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(-12, 20, 0, 8), AFFINEANIMCMD_FRAME(-12, 20, 0, 8),
AFFINEANIMCMD_FRAME(12, -20, 0, 8), AFFINEANIMCMD_FRAME(12, -20, 0, 8),
@@ -504,7 +504,7 @@ const struct SpriteTemplate gMiniTwinklingStarSpriteTemplate =
.callback = AnimMiniTwinklingStar, .callback = AnimMiniTwinklingStar,
}; };
const union AffineAnimCmd gStockpileDeformMonAffineAnimCmds[] = static const union AffineAnimCmd gStockpileDeformMonAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(8, -8, 0, 12), AFFINEANIMCMD_FRAME(8, -8, 0, 12),
AFFINEANIMCMD_FRAME(-16, 16, 0, 12), AFFINEANIMCMD_FRAME(-16, 16, 0, 12),
@@ -513,7 +513,7 @@ const union AffineAnimCmd gStockpileDeformMonAffineAnimCmds[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd gSpitUpDeformMonAffineAnimCmds[] = static const union AffineAnimCmd gSpitUpDeformMonAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(0, 6, 0, 20), AFFINEANIMCMD_FRAME(0, 6, 0, 20),
AFFINEANIMCMD_FRAME(0, 0, 0, 20), AFFINEANIMCMD_FRAME(0, 0, 0, 20),
@@ -535,7 +535,7 @@ const struct SpriteTemplate gSwallowBlueOrbSpriteTemplate =
.callback = AnimSwallowBlueOrb, .callback = AnimSwallowBlueOrb,
}; };
const union AffineAnimCmd gSwallowDeformMonAffineAnimCmds[] = static const union AffineAnimCmd gSwallowDeformMonAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(0, 6, 0, 20), AFFINEANIMCMD_FRAME(0, 6, 0, 20),
AFFINEANIMCMD_FRAME(0, 0, 0, 20), AFFINEANIMCMD_FRAME(0, 0, 0, 20),
@@ -553,26 +553,26 @@ const s8 gMorningSunLightBeamCoordsTable[] =
0x00, 0x00,
}; };
const union AnimCmd gGreenStarAnimCmds1[] = static const union AnimCmd gGreenStarAnimCmds1[] =
{ {
ANIMCMD_FRAME(0, 6), ANIMCMD_FRAME(0, 6),
ANIMCMD_FRAME(4, 6), ANIMCMD_FRAME(4, 6),
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
const union AnimCmd gGreenStarAnimCmds2[] = static const union AnimCmd gGreenStarAnimCmds2[] =
{ {
ANIMCMD_FRAME(8, 6), ANIMCMD_FRAME(8, 6),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gGreenStarAnimCmds3[] = static const union AnimCmd gGreenStarAnimCmds3[] =
{ {
ANIMCMD_FRAME(12, 6), ANIMCMD_FRAME(12, 6),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gGreenStarAnimTable[] = static const union AnimCmd *const gGreenStarAnimTable[] =
{ {
gGreenStarAnimCmds1, gGreenStarAnimCmds1,
gGreenStarAnimCmds2, gGreenStarAnimCmds2,
@@ -607,7 +607,7 @@ const u8 gDoomDesireLightBeamDelayTable[] =
50, 50,
}; };
const union AffineAnimCmd gStrongFrustrationAffineAnimCmds[] = static const union AffineAnimCmd gStrongFrustrationAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(0, -15, 0, 7), AFFINEANIMCMD_FRAME(0, -15, 0, 7),
AFFINEANIMCMD_FRAME(0, 15, 0, 7), AFFINEANIMCMD_FRAME(0, 15, 0, 7),
@@ -626,7 +626,7 @@ const struct SpriteTemplate gWeakFrustrationAngerMarkSpriteTemplate =
.callback = AnimWeakFrustrationAngerMark, .callback = AnimWeakFrustrationAngerMark,
}; };
const union AnimCmd gSweetScentPetalAnimCmds1[] = static const union AnimCmd gSweetScentPetalAnimCmds1[] =
{ {
ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(0, 8),
ANIMCMD_FRAME(1, 8), ANIMCMD_FRAME(1, 8),
@@ -639,7 +639,7 @@ const union AnimCmd gSweetScentPetalAnimCmds1[] =
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
const union AnimCmd gSweetScentPetalAnimCmds2[] = static const union AnimCmd gSweetScentPetalAnimCmds2[] =
{ {
ANIMCMD_FRAME(0, 8, .hFlip = TRUE), ANIMCMD_FRAME(0, 8, .hFlip = TRUE),
ANIMCMD_FRAME(1, 8, .hFlip = TRUE), ANIMCMD_FRAME(1, 8, .hFlip = TRUE),
@@ -652,13 +652,13 @@ const union AnimCmd gSweetScentPetalAnimCmds2[] =
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
const union AnimCmd gSweetScentPetalAnimCmds3[] = static const union AnimCmd gSweetScentPetalAnimCmds3[] =
{ {
ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(0, 8),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gSweetScentPetalAnimCmdTable[] = static const union AnimCmd *const gSweetScentPetalAnimCmdTable[] =
{ {
gSweetScentPetalAnimCmds1, gSweetScentPetalAnimCmds1,
gSweetScentPetalAnimCmds2, gSweetScentPetalAnimCmds2,
@@ -676,9 +676,9 @@ const struct SpriteTemplate gSweetScentPetalSpriteTemplate =
.callback = AnimSweetScentPetal, .callback = AnimSweetScentPetal,
}; };
const u16 gUnknown_83FF33C[] = INCBIN_U16("graphics/battle_anims/unk_83FF33C.gbapal"); //Unused static const u16 gUnknown_83FF33C[] = INCBIN_U16("graphics/battle_anims/unk_83FF33C.gbapal"); //Unused
const union AnimCmd gPainSplitAnimCmds[] = static const union AnimCmd gPainSplitAnimCmds[] =
{ {
ANIMCMD_FRAME(0, 5), ANIMCMD_FRAME(0, 5),
ANIMCMD_FRAME(4, 9), ANIMCMD_FRAME(4, 9),
@@ -686,7 +686,7 @@ const union AnimCmd gPainSplitAnimCmds[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gPainSplitAnimCmdTable[] = static const union AnimCmd *const gPainSplitAnimCmdTable[] =
{ {
gPainSplitAnimCmds, gPainSplitAnimCmds,
}; };
@@ -735,7 +735,7 @@ const struct SpriteTemplate gReversalOrbSpriteTemplate =
.callback = AnimReversalOrb, .callback = AnimReversalOrb,
}; };
const union AffineAnimCmd gDeepInhaleAffineAnimCmds[] = static const union AffineAnimCmd gDeepInhaleAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(16, 0, 0, 4), AFFINEANIMCMD_FRAME(16, 0, 0, 4),
AFFINEANIMCMD_FRAME(0, -3, 0, 16), AFFINEANIMCMD_FRAME(0, -3, 0, 16),
@@ -745,7 +745,7 @@ const union AffineAnimCmd gDeepInhaleAffineAnimCmds[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd gYawnCloudAffineAnimCmds1[] = static const union AffineAnimCmd gYawnCloudAffineAnimCmds1[] =
{ {
AFFINEANIMCMD_FRAME(0x80, 0x80, 0, 0), AFFINEANIMCMD_FRAME(0x80, 0x80, 0, 0),
AFFINEANIMCMD_FRAME(-8, -8, 0, 8), AFFINEANIMCMD_FRAME(-8, -8, 0, 8),
@@ -753,7 +753,7 @@ const union AffineAnimCmd gYawnCloudAffineAnimCmds1[] =
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
const union AffineAnimCmd gYawnCloudAffineAnimCmds2[] = static const union AffineAnimCmd gYawnCloudAffineAnimCmds2[] =
{ {
AFFINEANIMCMD_FRAME(0xC0, 0xC0, 0, 0), AFFINEANIMCMD_FRAME(0xC0, 0xC0, 0, 0),
AFFINEANIMCMD_FRAME(8, 8, 0, 8), AFFINEANIMCMD_FRAME(8, 8, 0, 8),
@@ -761,7 +761,7 @@ const union AffineAnimCmd gYawnCloudAffineAnimCmds2[] =
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
const union AffineAnimCmd gYawnCloudAffineAnimCmds3[] = static const union AffineAnimCmd gYawnCloudAffineAnimCmds3[] =
{ {
AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0), AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
AFFINEANIMCMD_FRAME(8, 8, 0, 8), AFFINEANIMCMD_FRAME(8, 8, 0, 8),
@@ -769,7 +769,7 @@ const union AffineAnimCmd gYawnCloudAffineAnimCmds3[] =
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
const union AffineAnimCmd *const gYawnCloudAffineAnimTable[] = static const union AffineAnimCmd *const gYawnCloudAffineAnimTable[] =
{ {
gYawnCloudAffineAnimCmds1, gYawnCloudAffineAnimCmds1,
gYawnCloudAffineAnimCmds2, gYawnCloudAffineAnimCmds2,
@@ -787,7 +787,7 @@ const struct SpriteTemplate gYawnCloudSpriteTemplate =
.callback = AnimYawnCloud, .callback = AnimYawnCloud,
}; };
const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds1[] = static const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds1[] =
{ {
AFFINEANIMCMD_FRAME(0x80, 0x80, 0, 0), AFFINEANIMCMD_FRAME(0x80, 0x80, 0, 0),
AFFINEANIMCMD_FRAME(-4, -6, 0, 16), AFFINEANIMCMD_FRAME(-4, -6, 0, 16),
@@ -795,7 +795,7 @@ const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds1[] =
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds2[] = static const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds2[] =
{ {
AFFINEANIMCMD_FRAME(0xC0, 0xC0, 0, 0), AFFINEANIMCMD_FRAME(0xC0, 0xC0, 0, 0),
AFFINEANIMCMD_FRAME(4, 6, 0, 16), AFFINEANIMCMD_FRAME(4, 6, 0, 16),
@@ -803,7 +803,7 @@ const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds2[] =
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds3[] = static const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds3[] =
{ {
AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0), AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
AFFINEANIMCMD_FRAME(4, 6, 0, 16), AFFINEANIMCMD_FRAME(4, 6, 0, 16),
@@ -811,7 +811,7 @@ const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds3[] =
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds4[] = static const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds4[] =
{ {
AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0), AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
AFFINEANIMCMD_FRAME(8, 10, 0, 30), AFFINEANIMCMD_FRAME(8, 10, 0, 30),
@@ -819,7 +819,7 @@ const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds4[] =
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
const union AffineAnimCmd *const gSmokeBallEscapeCloudAffineAnimTable[] = static const union AffineAnimCmd *const gSmokeBallEscapeCloudAffineAnimTable[] =
{ {
gSmokeBallEscapeCloudAffineAnimCmds1, gSmokeBallEscapeCloudAffineAnimCmds1,
gSmokeBallEscapeCloudAffineAnimCmds2, gSmokeBallEscapeCloudAffineAnimCmds2,
@@ -838,7 +838,7 @@ const struct SpriteTemplate gSmokeBallEscapeCloudSpriteTemplate =
.callback = AnimSmokeBallEscapeCloud, .callback = AnimSmokeBallEscapeCloud,
}; };
const union AffineAnimCmd gFacadeSquishAffineAnimCmds[] = static const union AffineAnimCmd gFacadeSquishAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(-16, 16, 0, 6), AFFINEANIMCMD_FRAME(-16, 16, 0, 6),
AFFINEANIMCMD_FRAME(16, -16, 0, 12), AFFINEANIMCMD_FRAME(16, -16, 0, 12),
@@ -885,21 +885,21 @@ const u16 gFacadeBlendColors[] =
RGB(29, 27, 0), RGB(29, 27, 0),
}; };
const union AnimCmd gRoarNoiseLineAnimCmds1[] = static const union AnimCmd gRoarNoiseLineAnimCmds1[] =
{ {
ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(0, 3),
ANIMCMD_FRAME(16, 3), ANIMCMD_FRAME(16, 3),
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
const union AnimCmd gRoarNoiseLineAnimCmds2[] = static const union AnimCmd gRoarNoiseLineAnimCmds2[] =
{ {
ANIMCMD_FRAME(32, 3), ANIMCMD_FRAME(32, 3),
ANIMCMD_FRAME(48, 3), ANIMCMD_FRAME(48, 3),
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
const union AnimCmd *const gRoarNoiseLineAnimTable[] = static const union AnimCmd *const gRoarNoiseLineAnimTable[] =
{ {
gRoarNoiseLineAnimCmds1, gRoarNoiseLineAnimCmds1,
gRoarNoiseLineAnimCmds2, gRoarNoiseLineAnimCmds2,
@@ -938,20 +938,20 @@ const struct SpriteTemplate gAssistPawprintSpriteTemplate =
.callback = AnimAssistPawprint, .callback = AnimAssistPawprint,
}; };
const union AffineAnimCmd gBarrageBallAffineAnimCmds1[] = static const union AffineAnimCmd gBarrageBallAffineAnimCmds1[] =
{ {
AFFINEANIMCMD_FRAME(0, 0, -4, 24), AFFINEANIMCMD_FRAME(0, 0, -4, 24),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd gBarrageBallAffineAnimCmds2[] = static const union AffineAnimCmd gBarrageBallAffineAnimCmds2[] =
{ {
AFFINEANIMCMD_FRAME(0x100, 0x100, -64, 0), AFFINEANIMCMD_FRAME(0x100, 0x100, -64, 0),
AFFINEANIMCMD_FRAME(0, 0, 4, 24), AFFINEANIMCMD_FRAME(0, 0, 4, 24),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd *const gBarrageBallAffineAnimTable[] = static const union AffineAnimCmd *const gBarrageBallAffineAnimTable[] =
{ {
gBarrageBallAffineAnimCmds1, gBarrageBallAffineAnimCmds1,
gBarrageBallAffineAnimCmds2, gBarrageBallAffineAnimCmds2,
@@ -979,7 +979,7 @@ const struct SpriteTemplate gSmellingSaltsHandSpriteTemplate =
.callback = AnimSmellingSaltsHand, .callback = AnimSmellingSaltsHand,
}; };
const union AffineAnimCmd gSmellingSaltsSquishAffineAnimCmds[] = static const union AffineAnimCmd gSmellingSaltsSquishAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(0, -16, 0, 6), AFFINEANIMCMD_FRAME(0, -16, 0, 6),
AFFINEANIMCMD_FRAME(0, 16, 0, 6), AFFINEANIMCMD_FRAME(0, 16, 0, 6),
@@ -1063,33 +1063,33 @@ const struct SpriteTemplate gUnknown_83FF704 =
.callback = sub_80E3E84, .callback = sub_80E3E84,
}; };
const union AnimCmd gKnockOffStrikeAnimCmds[] = static const union AnimCmd gKnockOffStrikeAnimCmds[] =
{ {
ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(0, 4),
ANIMCMD_FRAME(64, 4), ANIMCMD_FRAME(64, 4),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gKnockOffStrikeAnimTable[] = static const union AnimCmd *const gKnockOffStrikeAnimTable[] =
{ {
gKnockOffStrikeAnimCmds, gKnockOffStrikeAnimCmds,
}; };
const union AffineAnimCmd gKnockOffStrikeAffineanimCmds1[] = static const union AffineAnimCmd gKnockOffStrikeAffineanimCmds1[] =
{ {
AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0), AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
AFFINEANIMCMD_FRAME(0, 0, -4, 8), AFFINEANIMCMD_FRAME(0, 0, -4, 8),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd gKnockOffStrikeAffineanimCmds2[] = static const union AffineAnimCmd gKnockOffStrikeAffineanimCmds2[] =
{ {
AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0), AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0),
AFFINEANIMCMD_FRAME(0, 0, 4, 8), AFFINEANIMCMD_FRAME(0, 0, 4, 8),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd *const gKnockOffStrikeAffineAnimTable[] = static const union AffineAnimCmd *const gKnockOffStrikeAffineAnimTable[] =
{ {
gKnockOffStrikeAffineanimCmds1, gKnockOffStrikeAffineanimCmds1,
gKnockOffStrikeAffineanimCmds2, gKnockOffStrikeAffineanimCmds2,
@@ -1106,13 +1106,13 @@ const struct SpriteTemplate gKnockOffStrikeSpriteTemplate =
.callback = AnimKnockOffStrike, .callback = AnimKnockOffStrike,
}; };
const union AffineAnimCmd gRecycleSpriteAffineAnimCmds[] = static const union AffineAnimCmd gRecycleSpriteAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(0, 0, -4, 64), AFFINEANIMCMD_FRAME(0, 0, -4, 64),
AFFINEANIMCMD_JUMP(0), AFFINEANIMCMD_JUMP(0),
}; };
const union AffineAnimCmd *const gRecycleSpriteAffineAnimTable[] = static const union AffineAnimCmd *const gRecycleSpriteAffineAnimTable[] =
{ {
gRecycleSpriteAffineAnimCmds, gRecycleSpriteAffineAnimCmds,
}; };
@@ -1128,7 +1128,7 @@ const struct SpriteTemplate gRecycleSpriteTemplate =
.callback = AnimRecycle, .callback = AnimRecycle,
}; };
const union AffineAnimCmd gSlackOffSquishAffineAnimCmds[] = static const union AffineAnimCmd gSlackOffSquishAffineAnimCmds[] =
{ {
AFFINEANIMCMD_FRAME(0, 16, 0, 4), AFFINEANIMCMD_FRAME(0, 16, 0, 4),
AFFINEANIMCMD_FRAME(-2, 0, 0, 8), AFFINEANIMCMD_FRAME(-2, 0, 0, 8),
src/battle_anim_special.c
+10 -10
View File
@@ -158,7 +158,7 @@ const struct CompressedSpritePalette gBallParticlePalettes[] =
{gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_PREMIERBALL}, {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_PREMIERBALL},
}; };
const union AnimCmd gAnim_RegularBall[] = static const union AnimCmd gAnim_RegularBall[] =
{ {
ANIMCMD_FRAME(0, 1), ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 1), ANIMCMD_FRAME(1, 1),
@@ -169,38 +169,38 @@ const union AnimCmd gAnim_RegularBall[] =
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
const union AnimCmd gAnim_MasterBall[] = static const union AnimCmd gAnim_MasterBall[] =
{ {
ANIMCMD_FRAME(3, 1), ANIMCMD_FRAME(3, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gAnim_NetDiveBall[] = static const union AnimCmd gAnim_NetDiveBall[] =
{ {
ANIMCMD_FRAME(4, 1), ANIMCMD_FRAME(4, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gAnim_NestBall[] = static const union AnimCmd gAnim_NestBall[] =
{ {
ANIMCMD_FRAME(5, 1), ANIMCMD_FRAME(5, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gAnim_LuxuryPremierBall[] = static const union AnimCmd gAnim_LuxuryPremierBall[] =
{ {
ANIMCMD_FRAME(6, 4), ANIMCMD_FRAME(6, 4),
ANIMCMD_FRAME(7, 4), ANIMCMD_FRAME(7, 4),
ANIMCMD_JUMP(0), ANIMCMD_JUMP(0),
}; };
const union AnimCmd gAnim_UltraRepeatTimerBall[] = static const union AnimCmd gAnim_UltraRepeatTimerBall[] =
{ {
ANIMCMD_FRAME(7, 4), ANIMCMD_FRAME(7, 4),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gAnims_BallParticles[] = static const union AnimCmd *const gAnims_BallParticles[] =
{ {
gAnim_RegularBall, gAnim_RegularBall,
gAnim_MasterBall, gAnim_MasterBall,
@@ -391,13 +391,13 @@ const struct SpriteTemplate gPokeblockSpriteTemplate =
.callback = sub_80F1B3C, .callback = sub_80F1B3C,
}; };
const union AnimCmd gUnknown_840C204[] = static const union AnimCmd gUnknown_840C204[] =
{ {
ANIMCMD_FRAME(64, 1), ANIMCMD_FRAME(64, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gSpriteAnimTable_840C20C[] = static const union AnimCmd *const gSpriteAnimTable_840C20C[] =
{ {
gUnknown_840C204, gUnknown_840C204,
}; };
@@ -2216,7 +2216,7 @@ void AnimTask_LoadPokeblockGfx(u8 taskId)
LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[ANIM_TAG_POKEBLOCK - ANIM_SPRITES_START]); LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[ANIM_TAG_POKEBLOCK - ANIM_SPRITES_START]);
LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[ANIM_TAG_POKEBLOCK - ANIM_SPRITES_START]); LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[ANIM_TAG_POKEBLOCK - ANIM_SPRITES_START]);
paletteIndex = IndexOfSpritePaletteTag(ANIM_TAG_POKEBLOCK); // unused paletteIndex = IndexOfSpritePaletteTag(ANIM_TAG_POKEBLOCK);
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
src/battle_anim_utility_funcs.c
+2 -2
View File
@@ -496,9 +496,9 @@ static void sub_80BB2A0(u8 taskId)
gTasks[taskId].data[7] = gBattlerSpriteIds[sAnimStatsChangeData->battler2]; gTasks[taskId].data[7] = gBattlerSpriteIds[sAnimStatsChangeData->battler2];
gTasks[taskId].func = sub_80BB4B8; gTasks[taskId].func = sub_80BB4B8;
if (sAnimStatsChangeData->data[0] == 0) if (sAnimStatsChangeData->data[0] == 0)
PlaySE12WithPanning(SE_W287, BattleAnimAdjustPanning2(PAN_SIDE_PLAYER)); PlaySE12WithPanning(SE_W287, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER));
else else
PlaySE12WithPanning(SE_W287B, BattleAnimAdjustPanning2(PAN_SIDE_PLAYER)); PlaySE12WithPanning(SE_W287B, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER));
} }
static void sub_80BB4B8(u8 taskId) static void sub_80BB4B8(u8 taskId)
src/rock.c
+2 -2
View File
@@ -583,8 +583,8 @@ void sub_80B4BD0(u8 taskId)
task->data[5] = ((var3 - var1) * 8) / task->data[8]; task->data[5] = ((var3 - var1) * 8) / task->data[8];
task->data[6] = 0; task->data[6] = 0;
task->data[7] = 0; task->data[7] = 0;
pan1 = BattleAnimAdjustPanning(PAN_SIDE_PLAYER); pan1 = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER);
pan2 = BattleAnimAdjustPanning(PAN_SIDE_OPPONENT); pan2 = BattleAnimAdjustPanning(SOUND_PAN_TARGET);
task->data[13] = pan1; task->data[13] = pan1;
task->data[14] = (pan2 - pan1) / task->data[8]; task->data[14] = (pan2 - pan1) / task->data[8];
task->data[1] = var4; task->data[1] = var4;