mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-01-29 23:04:10 +01:00
Label more unused battle anims
This commit is contained in:
GriffinR
parent
82f870091e
commit
56057d3c32
@ -16,7 +16,12 @@
|
||||
#include "constants/rgb.h"
|
||||
#include "constants/songs.h"
|
||||
|
||||
EWRAM_DATA s16 gUnknown_0203A0F8[4] = {0};
|
||||
struct {
|
||||
s16 startX;
|
||||
s16 startY;
|
||||
s16 targetX;
|
||||
s16 targetY;
|
||||
} static EWRAM_DATA sFrenzyPlantRootData = {0}; // Debug? Written to but never read.
|
||||
|
||||
static void AnimMovePowderParticle(struct Sprite *);
|
||||
static void AnimMovePowderParticle_Step(struct Sprite *);
|
||||
@ -65,14 +70,14 @@ static void AnimFlyingParticle(struct Sprite *);
|
||||
static void AnimFlyingParticle_Step(struct Sprite *);
|
||||
static void AnimNeedleArmSpike(struct Sprite *);
|
||||
static void AnimNeedleArmSpike_Step(struct Sprite *);
|
||||
static void sub_81009F8(struct Sprite *);
|
||||
static void AnimSlidingHit(struct Sprite *);
|
||||
static void AnimWhipHit(struct Sprite *);
|
||||
static void sub_8100A94(struct Sprite *);
|
||||
static void AnimFlickeringPunch(struct Sprite *);
|
||||
static void AnimCuttingSlice(struct Sprite *);
|
||||
static void AnimAirCutterSlice(struct Sprite *);
|
||||
static void AnimSlice_Step(struct Sprite *);
|
||||
static void sub_8100E1C(struct Sprite *);
|
||||
static void sub_8100E80(struct Sprite *);
|
||||
static void AnimCirclingMusicNote(struct Sprite *);
|
||||
static void AnimCirclingMusicNote_Step(struct Sprite *);
|
||||
static void AnimProtect(struct Sprite *);
|
||||
static void AnimProtect_Step(struct Sprite *);
|
||||
static void AnimMilkBottle(struct Sprite *);
|
||||
@ -80,8 +85,8 @@ static void AnimMilkBottle_Step1(struct Sprite *);
|
||||
static void AnimMilkBottle_Step2(struct Sprite *, int, int);
|
||||
static void AnimGrantingStars(struct Sprite *);
|
||||
static void AnimSparkingStars(struct Sprite *);
|
||||
static void sub_8101440(struct Sprite *);
|
||||
static void sub_81014A0(struct Sprite *);
|
||||
static void AnimBubbleBurst(struct Sprite *);
|
||||
static void AnimBubbleBurst_Step(struct Sprite *);
|
||||
static void AnimSleepLetterZ(struct Sprite *);
|
||||
static void AnimSleepLetterZ_Step(struct Sprite *);
|
||||
static void AnimLockOnTarget(struct Sprite *);
|
||||
@ -99,8 +104,8 @@ static void AnimBowMon_Step2(struct Sprite *);
|
||||
static void AnimBowMon_Step3(struct Sprite *);
|
||||
static void AnimBowMon_Step4(struct Sprite *);
|
||||
static void AnimBowMon_Step3_Callback(struct Sprite *);
|
||||
static void sub_8101B90(struct Sprite *);
|
||||
static void sub_8101BA0(struct Sprite *);
|
||||
static void AnimTipMon(struct Sprite *);
|
||||
static void AnimTipMon_Step(struct Sprite *);
|
||||
static void AnimSlashSlice(struct Sprite *);
|
||||
static void AnimFalseSwipeSlice(struct Sprite *);
|
||||
static void AnimFalseSwipeSlice_Step1(struct Sprite *);
|
||||
@ -571,7 +576,7 @@ const struct SpriteTemplate gSwiftStarSpriteTemplate =
|
||||
.callback = AnimTranslateLinearSingleSineWave,
|
||||
};
|
||||
|
||||
const union AnimCmd gConstrictBindingAnimCmds1[] =
|
||||
static const union AnimCmd sAnim_ConstrictBinding[] =
|
||||
{
|
||||
ANIMCMD_FRAME(0, 4),
|
||||
ANIMCMD_FRAME(32, 4),
|
||||
@ -580,7 +585,7 @@ const union AnimCmd gConstrictBindingAnimCmds1[] =
|
||||
ANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AnimCmd gConstrictBindingAnimCmds2[] =
|
||||
static const union AnimCmd sAnim_ConstrictBinding_Flipped[] =
|
||||
{
|
||||
ANIMCMD_FRAME(0, 4, .hFlip = TRUE),
|
||||
ANIMCMD_FRAME(32, 4, .hFlip = TRUE),
|
||||
@ -589,29 +594,29 @@ const union AnimCmd gConstrictBindingAnimCmds2[] =
|
||||
ANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AnimCmd *const gConstrictBindingAnimTable[] =
|
||||
static const union AnimCmd *const sAnims_ConstrictBinding[] =
|
||||
{
|
||||
gConstrictBindingAnimCmds1,
|
||||
gConstrictBindingAnimCmds2,
|
||||
sAnim_ConstrictBinding,
|
||||
sAnim_ConstrictBinding_Flipped,
|
||||
};
|
||||
|
||||
const union AffineAnimCmd gConstrictBindingAffineAnimCmds1[] = {
|
||||
static const union AffineAnimCmd sAffineAnim_ConstrictBinding[] = {
|
||||
AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
|
||||
AFFINEANIMCMD_FRAME(-11, 0, 0, 6),
|
||||
AFFINEANIMCMD_FRAME(11, 0, 0, 6),
|
||||
AFFINEANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AffineAnimCmd gConstrictBindingAffineAnimCmds2[] = {
|
||||
static const union AffineAnimCmd sAffineAnim_ConstrictBinding_Flipped[] = {
|
||||
AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0),
|
||||
AFFINEANIMCMD_FRAME(11, 0, 0, 6),
|
||||
AFFINEANIMCMD_FRAME(-11, 0, 0, 6),
|
||||
AFFINEANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AffineAnimCmd *const gConstrictBindingAffineAnimTable[] = {
|
||||
gConstrictBindingAffineAnimCmds1,
|
||||
gConstrictBindingAffineAnimCmds2,
|
||||
static const union AffineAnimCmd *const sAffineAnims_ConstrictBinding[] = {
|
||||
sAffineAnim_ConstrictBinding,
|
||||
sAffineAnim_ConstrictBinding_Flipped,
|
||||
};
|
||||
|
||||
const struct SpriteTemplate gConstrictBindingSpriteTemplate =
|
||||
@ -619,9 +624,9 @@ const struct SpriteTemplate gConstrictBindingSpriteTemplate =
|
||||
.tileTag = ANIM_TAG_TENDRILS,
|
||||
.paletteTag = ANIM_TAG_TENDRILS,
|
||||
.oam = &gOamData_AffineNormal_ObjNormal_64x32,
|
||||
.anims = gConstrictBindingAnimTable,
|
||||
.anims = sAnims_ConstrictBinding,
|
||||
.images = NULL,
|
||||
.affineAnims = gConstrictBindingAffineAnimTable,
|
||||
.affineAnims = sAffineAnims_ConstrictBinding,
|
||||
.callback = AnimConstrictBinding,
|
||||
};
|
||||
|
||||
@ -1060,7 +1065,7 @@ const struct SpriteTemplate gNeedleArmSpikeSpriteTemplate =
|
||||
.callback = AnimNeedleArmSpike,
|
||||
};
|
||||
|
||||
const union AnimCmd gWhipAnimCmds1[] =
|
||||
static const union AnimCmd sAnim_Whip[] =
|
||||
{
|
||||
ANIMCMD_FRAME(64, 3),
|
||||
ANIMCMD_FRAME(80, 3),
|
||||
@ -1069,7 +1074,7 @@ const union AnimCmd gWhipAnimCmds1[] =
|
||||
ANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AnimCmd gWhipAnimCmds2[] =
|
||||
static const union AnimCmd sAnim_Whip_Flipped[] =
|
||||
{
|
||||
ANIMCMD_FRAME(64, 3, .hFlip = TRUE),
|
||||
ANIMCMD_FRAME(80, 3, .hFlip = TRUE),
|
||||
@ -1078,10 +1083,10 @@ const union AnimCmd gWhipAnimCmds2[] =
|
||||
ANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AnimCmd *const gWhipAnimTable[] =
|
||||
static const union AnimCmd *const sAnims_Whip[] =
|
||||
{
|
||||
gWhipAnimCmds1,
|
||||
gWhipAnimCmds2,
|
||||
sAnim_Whip,
|
||||
sAnim_Whip_Flipped,
|
||||
};
|
||||
|
||||
const struct SpriteTemplate gSlamHitSpriteTemplate =
|
||||
@ -1089,7 +1094,7 @@ const struct SpriteTemplate gSlamHitSpriteTemplate =
|
||||
.tileTag = ANIM_TAG_SLAM_HIT,
|
||||
.paletteTag = ANIM_TAG_SLAM_HIT,
|
||||
.oam = &gOamData_AffineOff_ObjNormal_32x32,
|
||||
.anims = gWhipAnimTable,
|
||||
.anims = sAnims_Whip,
|
||||
.images = NULL,
|
||||
.affineAnims = gDummySpriteAffineAnimTable,
|
||||
.callback = AnimWhipHit,
|
||||
@ -1100,13 +1105,13 @@ const struct SpriteTemplate gVineWhipSpriteTemplate =
|
||||
.tileTag = ANIM_TAG_WHIP_HIT,
|
||||
.paletteTag = ANIM_TAG_WHIP_HIT,
|
||||
.oam = &gOamData_AffineOff_ObjNormal_32x32,
|
||||
.anims = gWhipAnimTable,
|
||||
.anims = sAnims_Whip,
|
||||
.images = NULL,
|
||||
.affineAnims = gDummySpriteAffineAnimTable,
|
||||
.callback = AnimWhipHit,
|
||||
};
|
||||
|
||||
const union AnimCmd gUnknown_08592900[] =
|
||||
static const union AnimCmd sAnim_SlidingHit[] =
|
||||
{
|
||||
ANIMCMD_FRAME(0, 4),
|
||||
ANIMCMD_FRAME(16, 4),
|
||||
@ -1116,96 +1121,96 @@ const union AnimCmd gUnknown_08592900[] =
|
||||
ANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AnimCmd *const gUnknown_08592918[] =
|
||||
static const union AnimCmd *const sAnims_SlidingHit[] =
|
||||
{
|
||||
gUnknown_08592900,
|
||||
sAnim_SlidingHit,
|
||||
};
|
||||
|
||||
// Unused
|
||||
const struct SpriteTemplate gUnknown_0859291C =
|
||||
static const struct SpriteTemplate sSlidingHit1SpriteTemplate =
|
||||
{
|
||||
.tileTag = ANIM_TAG_HIT,
|
||||
.paletteTag = ANIM_TAG_HIT,
|
||||
.oam = &gOamData_AffineOff_ObjNormal_32x32,
|
||||
.anims = gUnknown_08592918,
|
||||
.anims = sAnims_SlidingHit,
|
||||
.images = NULL,
|
||||
.affineAnims = gDummySpriteAffineAnimTable,
|
||||
.callback = sub_81009F8,
|
||||
.callback = AnimSlidingHit,
|
||||
};
|
||||
|
||||
// Unused
|
||||
const struct SpriteTemplate gUnknown_08592934 =
|
||||
static const struct SpriteTemplate sSlidingHit2SpriteTemplate =
|
||||
{
|
||||
.tileTag = ANIM_TAG_HIT_2,
|
||||
.paletteTag = ANIM_TAG_HIT_2,
|
||||
.oam = &gOamData_AffineOff_ObjNormal_32x32,
|
||||
.anims = gUnknown_08592918,
|
||||
.anims = sAnims_SlidingHit,
|
||||
.images = NULL,
|
||||
.affineAnims = gDummySpriteAffineAnimTable,
|
||||
.callback = sub_81009F8,
|
||||
.callback = AnimSlidingHit,
|
||||
};
|
||||
|
||||
const union AffineAnimCmd gUnknown_0859294C[] = {
|
||||
static const union AffineAnimCmd sAffineAnim_FlickeringPunch_Normal[] = {
|
||||
AFFINEANIMCMD_FRAME(256, 256, 0, 0),
|
||||
AFFINEANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AffineAnimCmd gUnknown_0859295C[] = {
|
||||
static const union AffineAnimCmd sAffineAnim_FlickeringPunch_TurnedTopLeft[] = {
|
||||
AFFINEANIMCMD_FRAME(256, 256, 32, 0),
|
||||
AFFINEANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AffineAnimCmd gUnknown_0859296C[] = {
|
||||
static const union AffineAnimCmd sAffineAnim_FlickeringPunch_TurnedLeft[] = {
|
||||
AFFINEANIMCMD_FRAME(256, 256, 64, 0),
|
||||
AFFINEANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AffineAnimCmd gUnknown_0859297C[] = {
|
||||
static const union AffineAnimCmd sAffineAnim_FlickeringPunch_TurnedBottomLeft[] = {
|
||||
AFFINEANIMCMD_FRAME(256, 256, 96, 0),
|
||||
AFFINEANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AffineAnimCmd gUnknown_0859298C[] = {
|
||||
static const union AffineAnimCmd sAffineAnim_FlickeringPunch_UpsideDown[] = {
|
||||
AFFINEANIMCMD_FRAME(256, 256, -128, 0),
|
||||
AFFINEANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AffineAnimCmd gUnknown_0859299C[] = {
|
||||
static const union AffineAnimCmd sAffineAnim_FlickeringPunch_TurnedBottomRight[] = {
|
||||
AFFINEANIMCMD_FRAME(256, 256, -96, 0),
|
||||
AFFINEANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AffineAnimCmd gUnknown_085929AC[] = {
|
||||
static const union AffineAnimCmd sAffineAnim_FlickeringPunch_TurnedRight[] = {
|
||||
AFFINEANIMCMD_FRAME(256, 256, -64, 0),
|
||||
AFFINEANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AffineAnimCmd gUnknown_085929BC[] = {
|
||||
static const union AffineAnimCmd sAffineAnim_FlickeringPunch_TurnedTopRight[] = {
|
||||
AFFINEANIMCMD_FRAME(256, 256, -32, 0),
|
||||
AFFINEANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AffineAnimCmd *const gUnknown_085929CC[] = {
|
||||
gUnknown_0859294C,
|
||||
gUnknown_0859295C,
|
||||
gUnknown_0859296C,
|
||||
gUnknown_0859297C,
|
||||
gUnknown_0859298C,
|
||||
gUnknown_0859299C,
|
||||
gUnknown_085929AC,
|
||||
gUnknown_085929BC,
|
||||
static const union AffineAnimCmd *const sAffineAnims_FlickeringPunch[] = {
|
||||
sAffineAnim_FlickeringPunch_Normal,
|
||||
sAffineAnim_FlickeringPunch_TurnedTopLeft,
|
||||
sAffineAnim_FlickeringPunch_TurnedLeft,
|
||||
sAffineAnim_FlickeringPunch_TurnedBottomLeft,
|
||||
sAffineAnim_FlickeringPunch_UpsideDown,
|
||||
sAffineAnim_FlickeringPunch_TurnedBottomRight,
|
||||
sAffineAnim_FlickeringPunch_TurnedRight,
|
||||
sAffineAnim_FlickeringPunch_TurnedTopRight,
|
||||
};
|
||||
|
||||
// Unused
|
||||
const struct SpriteTemplate gUnknown_085929EC =
|
||||
static const struct SpriteTemplate sFlickeringPunchSpriteTemplate =
|
||||
{
|
||||
.tileTag = ANIM_TAG_HANDS_AND_FEET,
|
||||
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
|
||||
.oam = &gOamData_AffineNormal_ObjNormal_32x32,
|
||||
.anims = gDummySpriteAnimTable,
|
||||
.images = NULL,
|
||||
.affineAnims = gUnknown_085929CC,
|
||||
.callback = sub_8100A94,
|
||||
.affineAnims = sAffineAnims_FlickeringPunch,
|
||||
.callback = AnimFlickeringPunch,
|
||||
};
|
||||
|
||||
const union AnimCmd gCuttingSliceAnimCmds[] =
|
||||
@ -1244,90 +1249,90 @@ const struct SpriteTemplate gAirCutterSliceSpriteTemplate =
|
||||
.callback = AnimAirCutterSlice,
|
||||
};
|
||||
|
||||
const union AnimCmd gUnknown_08592A4C[] =
|
||||
static const union AnimCmd sAnim_CirclingMusicNote_Eighth[] =
|
||||
{
|
||||
ANIMCMD_FRAME(0, 1),
|
||||
ANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AnimCmd gUnknown_08592A54[] =
|
||||
static const union AnimCmd sAnim_CirclingMusicNote_BeamedEighth[] =
|
||||
{
|
||||
ANIMCMD_FRAME(4, 1),
|
||||
ANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AnimCmd gUnknown_08592A5C[] =
|
||||
static const union AnimCmd sAnim_CirclingMusicNote_SlantedBeamedEighth[] =
|
||||
{
|
||||
ANIMCMD_FRAME(8, 1),
|
||||
ANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AnimCmd gUnknown_08592A64[] =
|
||||
static const union AnimCmd sAnim_CirclingMusicNote_Quarter[] =
|
||||
{
|
||||
ANIMCMD_FRAME(12, 1),
|
||||
ANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AnimCmd gUnknown_08592A6C[] =
|
||||
static const union AnimCmd sAnim_CirclingMusicNote_QuarterRest[] =
|
||||
{
|
||||
ANIMCMD_FRAME(16, 1),
|
||||
ANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AnimCmd gUnknown_08592A74[] =
|
||||
static const union AnimCmd sAnim_CirclingMusicNote_EighthRest[] =
|
||||
{
|
||||
ANIMCMD_FRAME(20, 1),
|
||||
ANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AnimCmd gUnknown_08592A7C[] =
|
||||
static const union AnimCmd sAnim_CirclingMusicNote_Eighth_Flipped[] =
|
||||
{
|
||||
ANIMCMD_FRAME(0, 1, .vFlip = TRUE),
|
||||
ANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AnimCmd gUnknown_08592A84[] =
|
||||
static const union AnimCmd sAnim_CirclingMusicNote_BeamedEighth_Flipped[] =
|
||||
{
|
||||
ANIMCMD_FRAME(4, 1, .vFlip = TRUE),
|
||||
ANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AnimCmd gUnknown_08592A8C[] =
|
||||
static const union AnimCmd sAnim_CirclingMusicNote_SlantedBeamedEighth_Flipped[] =
|
||||
{
|
||||
ANIMCMD_FRAME(8, 1, .vFlip = TRUE),
|
||||
ANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AnimCmd gUnknown_08592A94[] =
|
||||
static const union AnimCmd sAnim_CirclingMusicNote_Quarter_Flipped[] =
|
||||
{
|
||||
ANIMCMD_FRAME(12, 1, .vFlip = TRUE),
|
||||
ANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AnimCmd *const gUnknown_08592A9C[] =
|
||||
static const union AnimCmd *const sAnims_CirclingMusicNote[] =
|
||||
{
|
||||
gUnknown_08592A4C,
|
||||
gUnknown_08592A54,
|
||||
gUnknown_08592A5C,
|
||||
gUnknown_08592A64,
|
||||
gUnknown_08592A6C,
|
||||
gUnknown_08592A74,
|
||||
gUnknown_08592A7C,
|
||||
gUnknown_08592A84,
|
||||
gUnknown_08592A8C,
|
||||
gUnknown_08592A94,
|
||||
sAnim_CirclingMusicNote_Eighth,
|
||||
sAnim_CirclingMusicNote_BeamedEighth,
|
||||
sAnim_CirclingMusicNote_SlantedBeamedEighth,
|
||||
sAnim_CirclingMusicNote_Quarter,
|
||||
sAnim_CirclingMusicNote_QuarterRest,
|
||||
sAnim_CirclingMusicNote_EighthRest,
|
||||
sAnim_CirclingMusicNote_Eighth_Flipped,
|
||||
sAnim_CirclingMusicNote_BeamedEighth_Flipped,
|
||||
sAnim_CirclingMusicNote_SlantedBeamedEighth_Flipped,
|
||||
sAnim_CirclingMusicNote_Quarter_Flipped,
|
||||
};
|
||||
|
||||
// Unused
|
||||
const struct SpriteTemplate gUnknown_08592AC4 =
|
||||
static const struct SpriteTemplate sCirclingMusicNoteSpriteTemplate =
|
||||
{
|
||||
.tileTag = ANIM_TAG_MUSIC_NOTES,
|
||||
.paletteTag = ANIM_TAG_MUSIC_NOTES,
|
||||
.oam = &gOamData_AffineOff_ObjNormal_16x16,
|
||||
.anims = gUnknown_08592A9C,
|
||||
.anims = sAnims_CirclingMusicNote,
|
||||
.images = NULL,
|
||||
.affineAnims = gDummySpriteAffineAnimTable,
|
||||
.callback = sub_8100E1C,
|
||||
.callback = AnimCirclingMusicNote,
|
||||
};
|
||||
|
||||
const struct SpriteTemplate gProtectSpriteTemplate =
|
||||
@ -1414,7 +1419,7 @@ const struct SpriteTemplate gSparklingStarsSpriteTemplate =
|
||||
.callback = AnimSparkingStars,
|
||||
};
|
||||
|
||||
const union AnimCmd gUnknown_08592BAC[] =
|
||||
static const union AnimCmd sAnim_BubbleBurst[] =
|
||||
{
|
||||
ANIMCMD_FRAME(0, 10),
|
||||
ANIMCMD_FRAME(4, 10),
|
||||
@ -1427,7 +1432,7 @@ const union AnimCmd gUnknown_08592BAC[] =
|
||||
ANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AnimCmd gUnknown_08592BD0[] =
|
||||
static const union AnimCmd sAnim_BubbleBurst_Flipped[] =
|
||||
{
|
||||
ANIMCMD_FRAME(0, 10, .hFlip = TRUE),
|
||||
ANIMCMD_FRAME(4, 10, .hFlip = TRUE),
|
||||
@ -1440,22 +1445,22 @@ const union AnimCmd gUnknown_08592BD0[] =
|
||||
ANIMCMD_END,
|
||||
};
|
||||
|
||||
const union AnimCmd *const gUnknown_08592BF4[] =
|
||||
static const union AnimCmd *const sAnims_BubbleBurst[] =
|
||||
{
|
||||
gUnknown_08592BAC,
|
||||
gUnknown_08592BD0,
|
||||
sAnim_BubbleBurst,
|
||||
sAnim_BubbleBurst_Flipped,
|
||||
};
|
||||
|
||||
// Unused
|
||||
const struct SpriteTemplate gUnknown_08592BFC =
|
||||
static const struct SpriteTemplate sBubbleBurstSpriteTemplate =
|
||||
{
|
||||
.tileTag = ANIM_TAG_BUBBLE_BURST,
|
||||
.paletteTag = ANIM_TAG_BUBBLE_BURST,
|
||||
.oam = &gOamData_AffineOff_ObjNormal_16x16,
|
||||
.anims = gUnknown_08592BF4,
|
||||
.anims = sAnims_BubbleBurst,
|
||||
.images = NULL,
|
||||
.affineAnims = gDummySpriteAffineAnimTable,
|
||||
.callback = sub_8101440,
|
||||
.callback = AnimBubbleBurst,
|
||||
};
|
||||
|
||||
const union AnimCmd gSleepLetterZAnimCmds[] =
|
||||
@ -1556,7 +1561,8 @@ const struct SpriteTemplate gBowMonSpriteTemplate =
|
||||
};
|
||||
|
||||
// Unused
|
||||
const struct SpriteTemplate gUnknown_08592CF0 =
|
||||
// Same as BowMon above but without backing up
|
||||
static const struct SpriteTemplate sTipMonSpriteTemplate =
|
||||
{
|
||||
.tileTag = 0,
|
||||
.paletteTag = 0,
|
||||
@ -1564,7 +1570,7 @@ const struct SpriteTemplate gUnknown_08592CF0 =
|
||||
.anims = gDummySpriteAnimTable,
|
||||
.images = NULL,
|
||||
.affineAnims = gDummySpriteAffineAnimTable,
|
||||
.callback = sub_8101B90,
|
||||
.callback = AnimTipMon,
|
||||
};
|
||||
|
||||
const union AnimCmd gSlashSliceAnimCmds1[] =
|
||||
@ -2684,9 +2690,9 @@ static void AnimTranslateLinearSingleSineWave_Step(struct Sprite* sprite)
|
||||
destroy = TRUE;
|
||||
}
|
||||
|
||||
if (sprite->pos1.x + sprite->pos2.x > 256
|
||||
if (sprite->pos1.x + sprite->pos2.x > DISPLAY_WIDTH + 16
|
||||
|| sprite->pos1.x + sprite->pos2.x < -16
|
||||
|| sprite->pos1.y + sprite->pos2.y > 160
|
||||
|| sprite->pos1.y + sprite->pos2.y > DISPLAY_HEIGHT
|
||||
|| sprite->pos1.y + sprite->pos2.y < -16)
|
||||
destroy = TRUE;
|
||||
|
||||
@ -2940,10 +2946,10 @@ static void AnimFrenzyPlantRoot(struct Sprite *sprite)
|
||||
StartSpriteAnim(sprite, gBattleAnimArgs[4]);
|
||||
sprite->data[2] = gBattleAnimArgs[5];
|
||||
sprite->callback = AnimRootFlickerOut;
|
||||
gUnknown_0203A0F8[0] = sprite->pos1.x;
|
||||
gUnknown_0203A0F8[1] = sprite->pos1.y;
|
||||
gUnknown_0203A0F8[2] = targetX;
|
||||
gUnknown_0203A0F8[3] = targetY;
|
||||
sFrenzyPlantRootData.startX = sprite->pos1.x;
|
||||
sFrenzyPlantRootData.startY = sprite->pos1.y;
|
||||
sFrenzyPlantRootData.targetX = targetX;
|
||||
sFrenzyPlantRootData.targetY = targetY;
|
||||
}
|
||||
|
||||
static void AnimRootFlickerOut(struct Sprite* sprite)
|
||||
@ -2979,7 +2985,7 @@ static void AnimIngrainOrb(struct Sprite* sprite)
|
||||
DestroyAnimSprite(sprite);
|
||||
}
|
||||
|
||||
static void sub_80FF9B8(struct Sprite* sprite, s16 c)
|
||||
static void InitItemBagData(struct Sprite* sprite, s16 c)
|
||||
{
|
||||
int a = (sprite->pos1.x << 8) | sprite->pos1.y;
|
||||
int b = (sprite->data[6] << 8) | sprite->data[7];
|
||||
@ -3005,7 +3011,7 @@ bool8 moveAlongLinearPath(struct Sprite* sprite)
|
||||
if (xEndPos == 0)
|
||||
xEndPos = -32;
|
||||
else if (xEndPos == 255)
|
||||
xEndPos = 272;
|
||||
xEndPos = DISPLAY_WIDTH + 32;
|
||||
|
||||
yEndPos_2 = yEndPos - yStartPos;
|
||||
r0 = xEndPos - xStartPos;
|
||||
@ -3059,14 +3065,14 @@ static void AnimPresent(struct Sprite* sprite)
|
||||
{
|
||||
sprite->data[6] = targetX;
|
||||
sprite->data[7] = targetY + 10;
|
||||
sub_80FF9B8(sprite, 60);
|
||||
InitItemBagData(sprite, 60);
|
||||
sprite->data[3] = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
sprite->data[6] = targetX;
|
||||
sprite->data[7] = targetY + 10;
|
||||
sub_80FF9B8(sprite, 60);
|
||||
InitItemBagData(sprite, 60);
|
||||
sprite->data[3] = 3;
|
||||
}
|
||||
|
||||
@ -3101,7 +3107,7 @@ static void AnimKnockOffItem(struct Sprite* sprite)
|
||||
{
|
||||
sprite->data[6] = 0;
|
||||
sprite->data[7] = targetY + 10;
|
||||
sub_80FF9B8(sprite, 40);
|
||||
InitItemBagData(sprite, 40);
|
||||
sprite->data[3] = 3;
|
||||
sprite->data[4] = 60;
|
||||
sprite->callback = AnimItemSteal_Step1;
|
||||
@ -3113,7 +3119,7 @@ static void AnimKnockOffItem(struct Sprite* sprite)
|
||||
if (IsContest())
|
||||
sprite->data[6] = 0;
|
||||
|
||||
sub_80FF9B8(sprite, 40);
|
||||
InitItemBagData(sprite, 40);
|
||||
sprite->data[3] = 3;
|
||||
sprite->data[4] = 60;
|
||||
sprite->callback = AnimKnockOffOpponentsItem;
|
||||
@ -3150,14 +3156,14 @@ static void AnimItemSteal(struct Sprite* sprite)
|
||||
{
|
||||
sprite->data[6] = attackerX;
|
||||
sprite->data[7] = attackerY + 10;
|
||||
sub_80FF9B8(sprite, 60);
|
||||
InitItemBagData(sprite, 60);
|
||||
sprite->data[3] = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
sprite->data[6] = attackerX;
|
||||
sprite->data[7] = attackerY + 10;
|
||||
sub_80FF9B8(sprite, 60);
|
||||
InitItemBagData(sprite, 60);
|
||||
sprite->data[3] = 3;
|
||||
}
|
||||
|
||||
@ -3737,7 +3743,7 @@ static void AnimWhipHit_WaitEnd(struct Sprite* sprite)
|
||||
DestroyAnimSprite(sprite);
|
||||
}
|
||||
|
||||
static void sub_81009F8(struct Sprite* sprite)
|
||||
static void AnimSlidingHit(struct Sprite* sprite)
|
||||
{
|
||||
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
|
||||
{
|
||||
@ -3764,7 +3770,7 @@ static void AnimWhipHit(struct Sprite* sprite)
|
||||
sprite->pos1.y += gBattleAnimArgs[1];
|
||||
}
|
||||
|
||||
static void sub_8100A94(struct Sprite* sprite)
|
||||
static void AnimFlickeringPunch(struct Sprite* sprite)
|
||||
{
|
||||
sprite->pos1.x += gBattleAnimArgs[0];
|
||||
sprite->pos1.y += gBattleAnimArgs[1];
|
||||
@ -3879,7 +3885,7 @@ static void AnimSlice_Step(struct Sprite* sprite)
|
||||
}
|
||||
}
|
||||
|
||||
void unref_sub_8100D38(struct Sprite* sprite)
|
||||
static void UnusedFlickerAnim(struct Sprite* sprite)
|
||||
{
|
||||
if (sprite->data[2] > 1)
|
||||
{
|
||||
@ -3912,7 +3918,7 @@ void unref_sub_8100D38(struct Sprite* sprite)
|
||||
}
|
||||
}
|
||||
|
||||
static void sub_8100E1C(struct Sprite* sprite)
|
||||
static void AnimCirclingMusicNote(struct Sprite* sprite)
|
||||
{
|
||||
sprite->data[0] = gBattleAnimArgs[2];
|
||||
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
|
||||
@ -3924,11 +3930,11 @@ static void sub_8100E1C(struct Sprite* sprite)
|
||||
sprite->data[1] = -gBattleAnimArgs[3];
|
||||
sprite->pos1.y += gBattleAnimArgs[1];
|
||||
sprite->data[3] = gBattleAnimArgs[4];
|
||||
sprite->callback = sub_8100E80;
|
||||
sprite->callback = AnimCirclingMusicNote_Step;
|
||||
sprite->callback(sprite);
|
||||
}
|
||||
|
||||
static void sub_8100E80(struct Sprite* sprite)
|
||||
static void AnimCirclingMusicNote_Step(struct Sprite* sprite)
|
||||
{
|
||||
sprite->pos2.x = Cos(sprite->data[0], 100);
|
||||
sprite->pos2.y = Sin(sprite->data[0], 20);
|
||||
@ -3938,7 +3944,7 @@ static void sub_8100E80(struct Sprite* sprite)
|
||||
sprite->subpriority = 14;
|
||||
|
||||
sprite->data[0] = (sprite->data[0] + sprite->data[1]) & 0xFF;
|
||||
sprite->data[5] += 0x82;
|
||||
sprite->data[5] += 130;
|
||||
sprite->pos2.y += sprite->data[5] >> 8;
|
||||
sprite->data[2]++;
|
||||
if (sprite->data[2] == sprite->data[3])
|
||||
@ -4169,7 +4175,7 @@ static void AnimSparkingStars(struct Sprite* sprite)
|
||||
sprite->callback = TranslateSpriteLinearFixedPoint;
|
||||
}
|
||||
|
||||
static void sub_8101440(struct Sprite* sprite)
|
||||
static void AnimBubbleBurst(struct Sprite* sprite)
|
||||
{
|
||||
SetSpriteCoordsToAnimAttackerCoords(sprite);
|
||||
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
|
||||
@ -4184,10 +4190,10 @@ static void sub_8101440(struct Sprite* sprite)
|
||||
StartSpriteAnim(sprite, 1);
|
||||
}
|
||||
|
||||
sprite->callback = sub_81014A0;
|
||||
sprite->callback = AnimBubbleBurst_Step;
|
||||
}
|
||||
|
||||
static void sub_81014A0(struct Sprite* sprite)
|
||||
static void AnimBubbleBurst_Step(struct Sprite* sprite)
|
||||
{
|
||||
if (++sprite->data[0] > 30)
|
||||
{
|
||||
@ -4511,13 +4517,13 @@ static void AnimBowMon_Step4(struct Sprite* sprite)
|
||||
DestroyAnimSprite(sprite);
|
||||
}
|
||||
|
||||
static void sub_8101B90(struct Sprite *sprite)
|
||||
static void AnimTipMon(struct Sprite *sprite)
|
||||
{
|
||||
sprite->data[0] = 0;
|
||||
sprite->callback = sub_8101BA0;
|
||||
sprite->callback = AnimTipMon_Step;
|
||||
}
|
||||
|
||||
static void sub_8101BA0(struct Sprite *sprite)
|
||||
static void AnimTipMon_Step(struct Sprite *sprite)
|
||||
{
|
||||
switch (sprite->data[0])
|
||||
{
|
||||
@ -4912,22 +4918,24 @@ void AnimTask_Conversion2AlphaBlend(u8 taskId)
|
||||
}
|
||||
}
|
||||
|
||||
void unref_sub_8102434(u8 taskId)
|
||||
// Unused
|
||||
static void AnimTask_HideBattlersHealthbox(u8 taskId)
|
||||
{
|
||||
u8 i;
|
||||
for (i = 0; i < gBattlersCount; i++)
|
||||
{
|
||||
if (gBattleAnimArgs[0] == 1 && GetBattlerSide(i) == B_SIDE_PLAYER)
|
||||
if (gBattleAnimArgs[0] == TRUE && GetBattlerSide(i) == B_SIDE_PLAYER)
|
||||
SetHealthboxSpriteInvisible(gHealthboxSpriteIds[i]);
|
||||
|
||||
if (gBattleAnimArgs[1] == 1 && GetBattlerSide(i) == B_SIDE_OPPONENT)
|
||||
if (gBattleAnimArgs[1] == TRUE && GetBattlerSide(i) == B_SIDE_OPPONENT)
|
||||
SetHealthboxSpriteInvisible(gHealthboxSpriteIds[i]);
|
||||
}
|
||||
|
||||
DestroyAnimVisualTask(taskId);
|
||||
}
|
||||
|
||||
void unref_sub_81024A8(u8 taskId)
|
||||
// Unused
|
||||
static void AnimTask_ShowBattlersHealthbox(u8 taskId)
|
||||
{
|
||||
u8 i;
|
||||
for (i = 0; i < gBattlersCount; i++)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user