Document move anims S-Z

This commit is contained in:
GriffinR
2020-02-19 20:22:53 -05:00
committed by huderlem
parent 0d651c7c9e
commit 208057d7ae
19 changed files with 370 additions and 362 deletions

View File

@@ -3122,7 +3122,7 @@ void AnimTask_StretchTargetUp(u8 taskId)
u8 spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
if (++gTasks[taskId].data[0] == 1)
{
PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(1), gUnknown_08593988);
PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_TARGET), gUnknown_08593988);
gSprites[spriteId].pos2.x = 4;
}
else
@@ -3137,12 +3137,12 @@ void AnimTask_StretchTargetUp(u8 taskId)
}
}
void sub_81060B0(u8 taskId)
void AnimTask_StretchAttackerUp(u8 taskId)
{
u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
if (++gTasks[taskId].data[0] == 1)
{
PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(0), gUnknown_08593988);
PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_ATTACKER), gUnknown_08593988);
gSprites[spriteId].pos2.x = 4;
}
else

View File

@@ -2416,7 +2416,7 @@ static void sub_80A8DFC(struct Sprite *sprite)
}
}
void sub_80A8E30(struct Sprite *sprite)
void AnimWeatherBallUp(struct Sprite *sprite)
{
sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
@@ -2440,7 +2440,7 @@ static void sub_80A8E88(struct Sprite *sprite)
DestroyAnimSprite(sprite);
}
void sub_80A8EE4(struct Sprite *sprite)
void AnimWeatherBallDown(struct Sprite *sprite)
{
int x;
sprite->data[0] = gBattleAnimArgs[2];

View File

@@ -75,7 +75,7 @@ static const union AnimCmd *const sSpriteAnimTable_853EE34[] =
sSpriteAnim_853EE2C
};
const struct SpriteTemplate gUnknown_0853EE38 =
const struct SpriteTemplate gWeatherBallUpSpriteTemplate =
{
.tileTag = ANIM_TAG_WEATHER_BALL,
.paletteTag = ANIM_TAG_WEATHER_BALL,
@@ -83,10 +83,10 @@ const struct SpriteTemplate gUnknown_0853EE38 =
.anims = sSpriteAnimTable_853EE34,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80A8E30,
.callback = AnimWeatherBallUp,
};
const struct SpriteTemplate gUnknown_0853EE50 =
const struct SpriteTemplate gWeatherBallNormalDownSpriteTemplate =
{
.tileTag = ANIM_TAG_WEATHER_BALL,
.paletteTag = ANIM_TAG_WEATHER_BALL,
@@ -94,7 +94,7 @@ const struct SpriteTemplate gUnknown_0853EE50 =
.anims = sSpriteAnimTable_853EE34,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80A8EE4,
.callback = AnimWeatherBallDown,
};
static const union AnimCmd sSpriteAnim_853EE68[] =

View File

@@ -759,7 +759,7 @@ void AnimTask_GetTargetIsAttackerPartner(u8 taskId)
#define tInvisible gBattleAnimArgs[0];
// For hiding or subsequently revealing all other battlers
void AnimTask_SetAllBattlersButAttackerInvisiblity(u8 taskId)
void AnimTask_SetAllNonAttackersInvisiblity(u8 taskId)
{
u16 battler;

View File

@@ -7,11 +7,11 @@
static void AnimMegahornHorn(struct Sprite *);
static void AnimLeechLifeNeedle(struct Sprite *);
void AnimTranslateWebThread(struct Sprite *);
void sub_81105B4(struct Sprite *);
static void AnimStringWrap(struct Sprite *);
void sub_811067C(struct Sprite *);
void AnimTranslateStinger(struct Sprite *);
void AnimMissileArc(struct Sprite *);
void sub_8110994(struct Sprite *);
static void AnimTailGlowOrb(struct Sprite *);
static void sub_811057C(struct Sprite *);
static void sub_8110630(struct Sprite *);
static void sub_81106A4(struct Sprite *);
@@ -101,7 +101,7 @@ const struct SpriteTemplate gWebThreadSpriteTemplate =
.callback = AnimTranslateWebThread,
};
const struct SpriteTemplate gUnknown_085969F8 =
const struct SpriteTemplate gStringWrapSpriteTemplate =
{
.tileTag = ANIM_TAG_STRING,
.paletteTag = ANIM_TAG_STRING,
@@ -109,7 +109,7 @@ const struct SpriteTemplate gUnknown_085969F8 =
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_81105B4,
.callback = AnimStringWrap,
};
const union AffineAnimCmd gUnknown_08596A10[] =
@@ -184,7 +184,7 @@ const union AffineAnimCmd *const gUnknown_08596AC4[] =
gUnknown_08596A8C,
};
const struct SpriteTemplate gUnknown_08596AC8 =
const struct SpriteTemplate gTailGlowOrbSpriteTemplate =
{
.tileTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT,
@@ -192,7 +192,7 @@ const struct SpriteTemplate gUnknown_08596AC8 =
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_08596AC4,
.callback = sub_8110994,
.callback = AnimTailGlowOrb,
};
static void AnimMegahornHorn(struct Sprite *sprite)
@@ -291,7 +291,8 @@ static void sub_811057C(struct Sprite *sprite)
sprite->data[6] = (sprite->data[6] + 13) & 0xFF;
}
void sub_81105B4(struct Sprite *sprite)
// Second stage of String Shot
static void AnimStringWrap(struct Sprite *sprite)
{
SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
if (GetBattlerSide(gBattleAnimAttacker))
@@ -473,9 +474,9 @@ static void AnimMissileArcStep(struct Sprite *sprite)
}
}
void sub_8110994(struct Sprite *sprite)
static void AnimTailGlowOrb(struct Sprite *sprite)
{
if (gBattleAnimArgs[0] == 0)
if (gBattleAnimArgs[0] == ANIM_ATTACKER)
{
sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + 18;

View File

@@ -257,6 +257,7 @@ static void AnimDragonRageFirePlume(struct Sprite *sprite)
StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
}
// For Dragon Breath and Dragon Rage
static void AnimDragonFireToTarget(struct Sprite *sprite)
{
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)

View File

@@ -10,24 +10,24 @@ static void sub_810A1F8(struct Sprite *);
static void sub_810A214(struct Sprite *);
static void sub_810A258(struct Sprite *);
static void sub_810A274(struct Sprite *);
static void sub_810A308(struct Sprite *);
static void sub_810A46C(struct Sprite *);
static void AnimSparkElectricity(struct Sprite *);
static void AnimZapCannonSpark(struct Sprite *);
static void sub_810A4F4(struct Sprite *);
static void sub_810A56C(struct Sprite *);
static void sub_810A5BC(struct Sprite *);
static void sub_810A628(struct Sprite *);
static void AnimThunderboltOrbSpriteTemplate(struct Sprite *);
static void AnimSparkElectricityFlashing(struct Sprite *);
static void sub_810A6EC(struct Sprite *);
static void sub_810A75C(struct Sprite *);
static void sub_810A834(u8 taskId);
static void sub_810A9DC(struct Sprite *);
static void sub_810AA2C(struct Sprite *);
static void AnimThunderWave(struct Sprite *);
static void sub_810AAB0(struct Sprite *);
static void sub_810AB78(u8 taskId);
static void sub_810AC8C(struct Sprite *);
static void sub_810ACC0(struct Sprite *);
static void AnimGrowingChargeOrb(struct Sprite *);
static void AnimElectricPuff(struct Sprite *);
static void sub_810AD98(struct Sprite *);
static void AnimVoltTackleOrbSlide(struct Sprite *);
static void sub_810ADF8(struct Sprite *);
static bool8 sub_810B154(struct Task *task, u8 taskId);
static void sub_810B1F0(struct Sprite *);
@@ -114,7 +114,7 @@ const struct SpriteTemplate gUnknown_08595734 =
.callback = sub_810A274,
};
const struct SpriteTemplate gBattleAnimSpriteTemplate_859574C =
const struct SpriteTemplate gSparkElectricitySpriteTemplate =
{
.tileTag = ANIM_TAG_SPARK_2,
.paletteTag = ANIM_TAG_SPARK_2,
@@ -122,10 +122,10 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_859574C =
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_810A308,
.callback = AnimSparkElectricity,
};
const struct SpriteTemplate gUnknown_08595764 =
const struct SpriteTemplate gZapCannonBallSpriteTemplate =
{
.tileTag = ANIM_TAG_BLACK_BALL_2,
.paletteTag = ANIM_TAG_BLACK_BALL_2,
@@ -147,7 +147,7 @@ const union AffineAnimCmd *const gUnknown_0859578C[] =
gUnknown_0859577C,
};
const struct SpriteTemplate gUnknown_08595790 =
const struct SpriteTemplate gZapCannonSparkSpriteTemplate =
{
.tileTag = ANIM_TAG_SPARK_2,
.paletteTag = ANIM_TAG_SPARK_2,
@@ -155,7 +155,7 @@ const struct SpriteTemplate gUnknown_08595790 =
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_0859578C,
.callback = sub_810A46C,
.callback = AnimZapCannonSpark,
};
const union AnimCmd gUnknown_085957A8[] =
@@ -184,7 +184,7 @@ const union AffineAnimCmd *const gUnknown_085957DC[] =
gUnknown_085957BC,
};
const struct SpriteTemplate gBattleAnimSpriteTemplate_85957E0 =
const struct SpriteTemplate gThunderboltOrbSpriteTemplate =
{
.tileTag = ANIM_TAG_SHOCK_3,
.paletteTag = ANIM_TAG_SHOCK_3,
@@ -192,10 +192,10 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_85957E0 =
.anims = gUnknown_085957B8,
.images = NULL,
.affineAnims = gUnknown_085957DC,
.callback = sub_810A5BC,
.callback = AnimThunderboltOrbSpriteTemplate,
};
const struct SpriteTemplate gBattleAnimSpriteTemplate_85957F8 =
const struct SpriteTemplate gSparkElectricityFlashingSpriteTemplate =
{
.tileTag = ANIM_TAG_SPARK_2,
.paletteTag = ANIM_TAG_SPARK_2,
@@ -203,7 +203,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_85957F8 =
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_0859578C,
.callback = sub_810A628,
.callback = AnimSparkElectricityFlashing,
};
const struct SpriteTemplate gElectricitySpriteTemplate =
@@ -228,7 +228,7 @@ const struct SpriteTemplate gUnknown_08595828 =
.callback = sub_810A9DC,
};
const struct SpriteTemplate gUnknown_08595840 =
const struct SpriteTemplate gThunderWaveSpriteTemplate =
{
.tileTag = ANIM_TAG_SPARK_H,
.paletteTag = ANIM_TAG_SPARK_H,
@@ -236,7 +236,7 @@ const struct SpriteTemplate gUnknown_08595840 =
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_810AA2C,
.callback = AnimThunderWave,
};
const s8 gUnknown_08595858[][2] =
@@ -367,7 +367,7 @@ const struct SpriteTemplate gElectricPuffSpriteTemplate =
.callback = AnimElectricPuff,
};
const struct SpriteTemplate gUnknown_085959A4 =
const struct SpriteTemplate gVoltTackleOrbSlideSpriteTemplate =
{
.tileTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT,
@@ -375,7 +375,7 @@ const struct SpriteTemplate gUnknown_085959A4 =
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_08595950,
.callback = sub_810AD98,
.callback = AnimVoltTackleOrbSlide,
};
const union AnimCmd gUnknown_085959BC[] =
@@ -510,7 +510,7 @@ static void sub_810A274(struct Sprite *sprite)
sprite->callback = TranslateSpriteInCircleOverDuration;
}
static void sub_810A308(struct Sprite *sprite)
static void AnimSparkElectricity(struct Sprite *sprite)
{
u8 battler;
u32 matrixNum;
@@ -518,20 +518,20 @@ static void sub_810A308(struct Sprite *sprite)
switch (gBattleAnimArgs[4])
{
case 0:
case ANIM_ATTACKER:
battler = gBattleAnimAttacker;
break;
case 1:
case ANIM_TARGET:
default:
battler = gBattleAnimTarget;
break;
case 2:
case ANIM_ATK_PARTNER:
if (!IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimAttacker)))
battler = gBattleAnimAttacker;
else
battler = BATTLE_PARTNER(gBattleAnimAttacker);
break;
case 3:
case ANIM_DEF_PARTNER:
if (IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimAttacker)))
battler = BATTLE_PARTNER(gBattleAnimTarget);
else
@@ -567,7 +567,7 @@ static void sub_810A308(struct Sprite *sprite)
sprite->callback = sub_810E2C8;
}
static void sub_810A46C(struct Sprite *sprite)
static void AnimZapCannonSpark(struct Sprite *sprite)
{
InitSpritePosToAnimAttacker(sprite, 1);
sprite->data[0] = gBattleAnimArgs[3];
@@ -609,7 +609,7 @@ static void sub_810A56C(struct Sprite *sprite)
DestroyAnimSprite(sprite);
}
static void sub_810A5BC(struct Sprite *sprite)
static void AnimThunderboltOrbSpriteTemplate(struct Sprite *sprite)
{
if (IsContest() || GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
@@ -622,7 +622,7 @@ static void sub_810A5BC(struct Sprite *sprite)
sprite->callback = sub_810A56C;
}
static void sub_810A628(struct Sprite *sprite)
static void AnimSparkElectricityFlashing(struct Sprite *sprite)
{
u8 battler;
@@ -655,7 +655,7 @@ static void sub_810A6EC(struct Sprite *sprite)
sprite->data[7] = (sprite->data[7] + sprite->data[6]) & 0xFF;
if (sprite->data[7] % sprite->data[4] == 0)
sprite->invisible ^= 1;
sprite->invisible ^= TRUE;
if (sprite->data[0]-- <= 0)
DestroyAnimSprite(sprite);
@@ -676,7 +676,8 @@ static void sub_810A75C(struct Sprite *sprite)
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
}
void sub_810A7DC(u8 taskId)
// The vertical falling thunder bolt used in Thunder Wave/Shock/Bolt
void AnimTask_ElectricBolt(u8 taskId)
{
gTasks[taskId].data[0] = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[0];
gTasks[taskId].data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[1];
@@ -769,13 +770,14 @@ static void sub_810A9DC(struct Sprite *sprite)
DestroySprite(sprite);
}
static void sub_810AA2C(struct Sprite *sprite)
// The horizontal bands of electricity used in Thunder Wave
static void AnimThunderWave(struct Sprite *sprite)
{
u8 spriteId;
sprite->pos1.x += gBattleAnimArgs[0];
sprite->pos1.y += gBattleAnimArgs[1];
spriteId = CreateSprite(&gUnknown_08595840, 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;
gAnimVisualTaskCount++;
gSprites[spriteId].callback = sub_810AAB0;
@@ -920,12 +922,13 @@ static void AnimElectricPuff(struct Sprite *sprite)
sprite->callback = RunStoredCallbackWhenAnimEnds;
}
static void sub_810AD98(struct Sprite *sprite)
// Creates an orb of electricity that grwos then slides off-screen. The attacker slides with it
static void AnimVoltTackleOrbSlide(struct Sprite *sprite)
{
StartSpriteAffineAnim(sprite, 1);
sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
sprite->data[6] = GetAnimBattlerSpriteId(0);
sprite->data[6] = GetAnimBattlerSpriteId(ANIM_ATTACKER);
sprite->data[7] = 16;
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
@@ -950,14 +953,14 @@ static void sub_810ADF8(struct Sprite *sprite)
}
}
void sub_810AE5C(u8 taskId)
void AnimTask_VoltTackleAttackerReappear(u8 taskId)
{
struct Task *task = &gTasks[taskId];
switch (task->data[0])
{
case 0:
task->data[15] = GetAnimBattlerSpriteId(0);
task->data[15] = GetAnimBattlerSpriteId(ANIM_ATTACKER);
task->data[14] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
{
@@ -1005,7 +1008,8 @@ void sub_810AE5C(u8 taskId)
}
}
void sub_810AFCC(u8 taskId)
// The horizontal bolts of electricity for Volt Tackle
void AnimTask_VoltTackleBolt(u8 taskId)
{
struct Task *task = &gTasks[taskId];

View File

@@ -18,9 +18,9 @@ static void AnimStompFoot(struct Sprite *);
static void AnimDizzyPunchDuck(struct Sprite *);
void sub_810D40C(struct Sprite *);
void sub_810D4F4(struct Sprite *);
void sub_810D608(struct Sprite *);
void sub_810D714(struct Sprite *);
void sub_810D874(struct Sprite *);
static void AnimSuperpowerOrb(struct Sprite *);
static void AnimSuperpowerRock(struct Sprite *);
static void AnimSuperpowerFireball(struct Sprite *);
static void AnimArmThrustHit(struct Sprite *);
void sub_810DA10(struct Sprite *);
static void AnimFocusPunchFist(struct Sprite *);
@@ -209,7 +209,7 @@ const struct SpriteTemplate gMegaPunchKickSpriteTemplate =
.callback = AnimSpinningKickOrPunch,
};
const struct SpriteTemplate gUnknown_08595F60 =
const struct SpriteTemplate gStompFootSpriteTemplate =
{
.tileTag = ANIM_TAG_HANDS_AND_FEET,
.paletteTag = ANIM_TAG_HANDS_AND_FEET,
@@ -267,7 +267,7 @@ const union AffineAnimCmd *const gUnknown_08595FE8[] =
gUnknown_08595FC0,
};
const struct SpriteTemplate gUnknown_08595FEC =
const struct SpriteTemplate gSuperpowerOrbSpriteTemplate =
{
.tileTag = ANIM_TAG_CIRCLE_OF_LIGHT,
.paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT,
@@ -275,10 +275,10 @@ const struct SpriteTemplate gUnknown_08595FEC =
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_08595FE8,
.callback = sub_810D608,
.callback = AnimSuperpowerOrb,
};
const struct SpriteTemplate gUnknown_08596004 =
const struct SpriteTemplate gSuperpowerRockSpriteTemplate =
{
.tileTag = ANIM_TAG_FLAT_ROCK,
.paletteTag = ANIM_TAG_FLAT_ROCK,
@@ -286,10 +286,10 @@ const struct SpriteTemplate gUnknown_08596004 =
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_810D714,
.callback = AnimSuperpowerRock,
};
const struct SpriteTemplate gUnknown_0859601C =
const struct SpriteTemplate gSuperpowerFireballSpriteTemplate =
{
.tileTag = ANIM_TAG_METEOR,
.paletteTag = ANIM_TAG_METEOR,
@@ -297,7 +297,7 @@ const struct SpriteTemplate gUnknown_0859601C =
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_810D874,
.callback = AnimSuperpowerFireball,
};
const struct SpriteTemplate gArmThrustHandSpriteTemplate =
@@ -795,9 +795,9 @@ static void sub_810D5DC(struct Sprite *sprite)
DestroyAnimSprite(sprite);
}
void sub_810D608(struct Sprite *sprite)
static void AnimSuperpowerOrb(struct Sprite *sprite)
{
if (gBattleAnimArgs[0] == 0)
if (gBattleAnimArgs[0] == ANIM_ATTACKER)
{
sprite->pos1.x = GetBattlerSpriteCoord(gBattlerAttacker, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gBattlerAttacker, 3);
@@ -834,7 +834,8 @@ static void sub_810D6A8(struct Sprite *sprite)
}
}
void sub_810D714(struct Sprite *sprite)
// Floating rock that flies off to hit the target. Used by Superpower
static void AnimSuperpowerRock(struct Sprite *sprite)
{
sprite->pos1.x = gBattleAnimArgs[0];
sprite->pos1.y = 120;
@@ -895,11 +896,11 @@ static void sub_810D830(struct Sprite *sprite)
DestroyAnimSprite(sprite);
}
void sub_810D874(struct Sprite *sprite)
static void AnimSuperpowerFireball(struct Sprite *sprite)
{
u8 battler;
if (gBattleAnimArgs[0] == 0)
if (gBattleAnimArgs[0] == ANIM_ATTACKER)
{
sprite->pos1.x = GetBattlerSpriteCoord(gBattlerAttacker, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gBattlerAttacker, 3);

View File

@@ -14,7 +14,7 @@ static void sub_8108FBC(struct Sprite *);
static void sub_8109028(struct Sprite *);
static void sub_8109064(struct Sprite *);
static void sub_81090D8(struct Sprite *);
static void sub_810916C(struct Sprite *);
static void AnimSunlight(struct Sprite *);
static void AnimEmberFlare(struct Sprite *);
static void sub_8109200(struct Sprite *);
static void AnimFireRing(struct Sprite *);
@@ -34,9 +34,9 @@ static void sub_8109984(struct Sprite *sprite, s16 x, s16 y);
static void sub_81099A0(struct Sprite *);
static void AnimEruptionFallingRock(struct Sprite *);
static void sub_8109A64(struct Sprite *);
static void sub_8109AFC(struct Sprite *);
static void AnimWillOWispOrb(struct Sprite *);
static void sub_8109C4C(struct Sprite *);
static void sub_8109CB0(struct Sprite *);
static void AnimWillOWispFire(struct Sprite *);
static void sub_8109E2C(u8 taskId);
const union AnimCmd gUnknown_08595340[] =
@@ -208,7 +208,7 @@ const union AffineAnimCmd *const gUnknown_0859549C[] =
gUnknown_08595484,
};
const struct SpriteTemplate gUnknown_085954A0 =
const struct SpriteTemplate gSunnyDayLightRaySpriteTemplate =
{
.tileTag = ANIM_TAG_SUNLIGHT,
.paletteTag = ANIM_TAG_SUNLIGHT,
@@ -216,7 +216,7 @@ const struct SpriteTemplate gUnknown_085954A0 =
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_0859549C,
.callback = sub_810916C,
.callback = AnimSunlight,
};
const union AnimCmd gUnknown_085954B8[] =
@@ -330,7 +330,7 @@ const struct SpriteTemplate gFireSpiralOutwardSpriteTemplate =
.callback = AnimFireSpiralOutward,
};
const struct SpriteTemplate gUnknown_0859559C =
const struct SpriteTemplate gWeatherBallFireDownSpriteTemplate =
{
.tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER,
@@ -338,7 +338,7 @@ const struct SpriteTemplate gUnknown_0859559C =
.anims = gUnknown_085954D0,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80A8EE4,
.callback = AnimWeatherBallDown,
};
const struct SpriteTemplate gUnknown_085955B4 =
@@ -410,7 +410,7 @@ const union AnimCmd *const gUnknown_0859562C[] =
gUnknown_08595624,
};
const struct SpriteTemplate gUnknown_0859563C =
const struct SpriteTemplate gWillOWispOrbSpriteTemplate =
{
.tileTag = ANIM_TAG_WISP_ORB,
.paletteTag = ANIM_TAG_WISP_ORB,
@@ -418,7 +418,7 @@ const struct SpriteTemplate gUnknown_0859563C =
.anims = gUnknown_0859562C,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_8109AFC,
.callback = AnimWillOWispOrb,
};
const union AnimCmd gUnknown_08595654[] =
@@ -435,7 +435,7 @@ const union AnimCmd *const gUnknown_08595668[] =
gUnknown_08595654,
};
const struct SpriteTemplate gUnknown_0859566C =
const struct SpriteTemplate gWillOWispFireSpriteTemplate =
{
.tileTag = ANIM_TAG_WISP_FIRE,
.paletteTag = ANIM_TAG_WISP_FIRE,
@@ -443,7 +443,7 @@ const struct SpriteTemplate gUnknown_0859566C =
.anims = gUnknown_08595668,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_8109CB0,
.callback = AnimWillOWispFire,
};
const s8 gUnknown_08595684[16] =
@@ -594,8 +594,8 @@ static void sub_81090D8(struct Sprite *sprite)
}
}
//sunlight
static void sub_810916C(struct Sprite *sprite)
// Sunlight from Sunny Day
static void AnimSunlight(struct Sprite *sprite)
{
sprite->pos1.x = 0;
sprite->pos1.y = 0;
@@ -1052,8 +1052,7 @@ static void sub_8109A64(struct Sprite *sprite)
}
}
//wisp orb
static void sub_8109AFC(struct Sprite *sprite)
static void AnimWillOWispOrb(struct Sprite *sprite)
{
switch (sprite->data[0])
{
@@ -1141,8 +1140,7 @@ static void sub_8109C4C(struct Sprite *sprite)
}
}
//wisp fire
void sub_8109CB0(struct Sprite *sprite)
static void AnimWillOWispFire(struct Sprite *sprite)
{
if (!sprite->data[0])
{

View File

@@ -17,7 +17,7 @@ static void AnimFallingFeather(struct Sprite *);
void sub_810E520(struct Sprite *);
void sub_810EB40(struct Sprite *);
void sub_810EA4C(struct Sprite *);
void sub_810EAA0(struct Sprite *);
static void AnimWhirlwindLine(struct Sprite *);
void sub_810EC34(struct Sprite *);
void sub_810EC94(struct Sprite *);
static void AnimDiveBall(struct Sprite *);
@@ -205,7 +205,7 @@ const union AnimCmd *const gUnknown_085963D0[] =
gUnknown_085963B8,
};
const struct SpriteTemplate gUnknown_085963D4 =
const struct SpriteTemplate gWhirlwindLineSpriteTemplate =
{
.tileTag = ANIM_TAG_WHIRLWIND_LINES,
.paletteTag = ANIM_TAG_WHIRLWIND_LINES,
@@ -213,7 +213,7 @@ const struct SpriteTemplate gUnknown_085963D4 =
.anims = gUnknown_085963D0,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_810EAA0,
.callback = AnimWhirlwindLine,
};
const union AffineAnimCmd gUnknown_085963EC[] =
@@ -911,18 +911,18 @@ void sub_810EA4C(struct Sprite *sprite)
sprite->callback = TranslateAnimSpriteToTargetMonLocation;
}
void sub_810EAA0(struct Sprite * sprite)
static void AnimWhirlwindLine(struct Sprite * sprite)
{
u16 arg;
u8 mult;
if (!gBattleAnimArgs[2])
if (gBattleAnimArgs[2] == ANIM_ATTACKER)
InitSpritePosToAnimAttacker(sprite, 0);
else
InitSpritePosToAnimTarget(sprite, FALSE);
if ((!gBattleAnimArgs[2] && !GetBattlerSide(gBattleAnimAttacker))
|| (gBattleAnimArgs[2] == 1 && !GetBattlerSide(gBattleAnimTarget)))
if ((gBattleAnimArgs[2] == ANIM_ATTACKER && !GetBattlerSide(gBattleAnimAttacker))
|| (gBattleAnimArgs[2] == ANIM_TARGET && !GetBattlerSide(gBattleAnimTarget)))
{
sprite->pos1.x += 8;
}

View File

@@ -586,7 +586,8 @@ static void sub_8111D78(u8 taskId)
}
}
void sub_8111E50(u8 taskId)
// Creates a blended copy of the target that wavers in front of them
void AnimTask_SpiteTargetShadow(u8 taskId)
{
struct Task *task;

View File

@@ -325,7 +325,7 @@ const struct SpriteTemplate gMistCloudSpriteTemplate =
.callback = InitSwirlingFogAnim,
};
const struct SpriteTemplate gUnknown_08595C44 =
const struct SpriteTemplate gSmogCloudSpriteTemplate =
{
.tileTag = ANIM_TAG_PURPLE_GAS_CLOUD,
.paletteTag = ANIM_TAG_PURPLE_GAS_CLOUD,
@@ -429,7 +429,7 @@ const struct SpriteTemplate gUnknown_08595D2C =
.callback = AnimHailBegin,
};
const struct SpriteTemplate gUnknown_08595D44 =
const struct SpriteTemplate gWeatherBallIceDownSpriteTemplate =
{
.tileTag = ANIM_TAG_HAIL,
.paletteTag = ANIM_TAG_HAIL,
@@ -437,7 +437,7 @@ const struct SpriteTemplate gUnknown_08595D44 =
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_08595D28,
.callback = sub_80A8EE4,
.callback = AnimWeatherBallDown,
};
const union AnimCmd gUnknown_08595D5C[] =

View File

@@ -176,7 +176,8 @@ const struct SpriteTemplate gBasicHitSplatSpriteTemplate =
.callback = AnimBasicHitSplat,
};
const struct SpriteTemplate gBattleAnimSpriteTemplate_8597370 =
// TODO: Needs generic descriptive name, what distinguishes this hit splat
const struct SpriteTemplate gSpikeHitSplatSpriteTemplate =
{
.tileTag = ANIM_TAG_IMPACT,
.paletteTag = ANIM_TAG_IMPACT,
@@ -625,7 +626,8 @@ static void sub_8115D2C(u8 taskId)
}
}
void sub_8115D94(u8 taskId)
// Flashes the specified anim tag with given color. Used e.g. to flash the particles in Hyper Beam red
void AnimTask_FlashAnimTagWithColor(u8 taskId)
{
u8 paletteIndex;

View File

@@ -3,11 +3,11 @@
#include "trig.h"
#include "constants/rgb.h"
void sub_810DBAC(struct Sprite *);
void AnimAcidPoisonBubble(struct Sprite *);
void sub_810DCD0(struct Sprite *);
void AnimAcidPoisonDroplet(struct Sprite *);
void AnimBubbleEffect(struct Sprite *);
static void AnimSludgeProjectile(struct Sprite *);
static void AnimAcidPoisonBubble(struct Sprite *);
static void AnimSludgeBombHitParticle(struct Sprite *);
static void AnimAcidPoisonDroplet(struct Sprite *);
static void AnimBubbleEffect(struct Sprite *);
static void sub_810DC10(struct Sprite *);
static void sub_810DCB4(struct Sprite *);
static void sub_810DD24(struct Sprite *);
@@ -29,7 +29,7 @@ const union AnimCmd *const gUnknown_08596130[] =
gUnknown_0859611C,
};
const struct SpriteTemplate gUnknown_08596134 =
const struct SpriteTemplate gToxicBubbleSpriteTemplate =
{
.tileTag = ANIM_TAG_TOXIC_BUBBLE,
.paletteTag = ANIM_TAG_TOXIC_BUBBLE,
@@ -97,7 +97,7 @@ const union AffineAnimCmd *const gUnknown_085961A4[] =
gUnknown_08596190,
};
const struct SpriteTemplate gUnknown_085961A8 =
const struct SpriteTemplate gSludgeProjectileSpriteTemplate =
{
.tileTag = ANIM_TAG_POISON_BUBBLE,
.paletteTag = ANIM_TAG_POISON_BUBBLE,
@@ -105,7 +105,7 @@ const struct SpriteTemplate gUnknown_085961A8 =
.anims = gUnknown_08596164,
.images = NULL,
.affineAnims = gUnknown_085961A0,
.callback = sub_810DBAC,
.callback = AnimSludgeProjectile,
};
const struct SpriteTemplate gAcidPoisonBubbleSpriteTemplate =
@@ -119,7 +119,7 @@ const struct SpriteTemplate gAcidPoisonBubbleSpriteTemplate =
.callback = AnimAcidPoisonBubble,
};
const struct SpriteTemplate gUnknown_085961D8 =
const struct SpriteTemplate gSludgeBombHitParticleSpriteTemplate =
{
.tileTag = ANIM_TAG_POISON_BUBBLE,
.paletteTag = ANIM_TAG_POISON_BUBBLE,
@@ -127,7 +127,7 @@ const struct SpriteTemplate gUnknown_085961D8 =
.anims = gUnknown_0859616C,
.images = NULL,
.affineAnims = gUnknown_085961A4,
.callback = sub_810DCD0,
.callback = AnimSludgeBombHitParticle,
};
const union AffineAnimCmd gUnknown_085961F0[] =
@@ -187,7 +187,7 @@ const struct SpriteTemplate gWaterBubbleSpriteTemplate =
.callback = AnimBubbleEffect,
};
void sub_810DBAC(struct Sprite *sprite)
static void AnimSludgeProjectile(struct Sprite *sprite)
{
if (!gBattleAnimArgs[3])
StartSpriteAnim(sprite, 2);
@@ -210,7 +210,7 @@ static void sub_810DC10(struct Sprite *sprite)
DestroyAnimSprite(sprite);
}
void AnimAcidPoisonBubble(struct Sprite *sprite)
static void AnimAcidPoisonBubble(struct Sprite *sprite)
{
s16 l1, l2;
if (!gBattleAnimArgs[3])
@@ -238,7 +238,7 @@ static void sub_810DCB4(struct Sprite *sprite)
DestroyAnimSprite(sprite);
}
void sub_810DCD0(struct Sprite *sprite)
static void AnimSludgeBombHitParticle(struct Sprite *sprite)
{
sprite->data[0] = gBattleAnimArgs[2];
sprite->data[1] = sprite->pos1.x;
@@ -265,7 +265,7 @@ static void sub_810DD24(struct Sprite *sprite)
DestroyAnimSprite(sprite);
}
void AnimAcidPoisonDroplet(struct Sprite *sprite)
static void AnimAcidPoisonDroplet(struct Sprite *sprite)
{
SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y);
@@ -289,7 +289,7 @@ void AnimAcidPoisonDroplet(struct Sprite *sprite)
// arg 0: initial x pixel offset
// arg 1: initial y pixel offset
// arg 2: 0 = single-target, 1 = multi-target
void AnimBubbleEffect(struct Sprite *sprite)
static void AnimBubbleEffect(struct Sprite *sprite)
{
if (!gBattleAnimArgs[2])
{

View File

@@ -703,7 +703,7 @@ static void sub_810F810(u8 taskId)
DestroyAnimVisualTask(taskId);
}
void sub_810F83C(u8 taskId)
void AnimTask_Teleport(u8 taskId)
{
struct Task *task = &gTasks[taskId];
u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);

View File

@@ -20,7 +20,7 @@ void sub_81110A4(u8 taskId);
static void AnimRolloutParticle(struct Sprite *);
static void AnimRockTomb(struct Sprite *);
static void AnimRockBlastRock(struct Sprite *);
void sub_8111444(struct Sprite *);
static void AnimRockScatter(struct Sprite *);
static void AnimParticleInVortex(struct Sprite *);
static void sub_8110A70(struct Sprite *);
static void sub_8110B80(struct Sprite *sprite);
@@ -280,10 +280,10 @@ const struct SpriteTemplate gRockScatterSpriteTemplate =
.anims = gUnknown_08596BF8,
.images = NULL,
.affineAnims = gUnknown_08596C90,
.callback = sub_8111444,
.callback = AnimRockScatter,
};
const struct SpriteTemplate gUnknown_08596CC8 =
const struct SpriteTemplate gTwisterRockParticleSpriteTemplate =
{
.tileTag = ANIM_TAG_ROCKS,
.paletteTag = ANIM_TAG_ROCKS,
@@ -294,7 +294,7 @@ const struct SpriteTemplate gUnknown_08596CC8 =
.callback = AnimMoveTwisterParticle,
};
const struct SpriteTemplate gUnknown_08596CE0 =
const struct SpriteTemplate gWeatherBallRockDownSpriteTemplate =
{
.tileTag = ANIM_TAG_ROCKS,
.paletteTag = ANIM_TAG_ROCKS,
@@ -302,7 +302,7 @@ const struct SpriteTemplate gUnknown_08596CE0 =
.anims = gUnknown_08596C00,
.images = NULL,
.affineAnims = gUnknown_08596C90,
.callback = sub_80A8EE4,
.callback = AnimWeatherBallDown,
};
static void AnimFallingRock(struct Sprite *sprite)
@@ -796,7 +796,7 @@ static void AnimRockBlastRock(struct Sprite *sprite)
TranslateAnimSpriteToTargetMonLocation(sprite);
}
void sub_8111444(struct Sprite *sprite)
static void AnimRockScatter(struct Sprite *sprite)
{
sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);

View File

@@ -26,7 +26,7 @@ void sub_8107674(struct Sprite *);
static void AnimHydroCannonCharge(struct Sprite *);
static void AnimWaitForHydroCannonChargeEnd(struct Sprite *);
static void AnimHydroCannonBeam(struct Sprite *);
void sub_8107894(struct Sprite *);
static void AnimWaterGunDroplet(struct Sprite *);
static void AnimSmallBubblePair(struct Sprite *);
void sub_810790C(struct Sprite *);
void sub_8108034(struct Sprite *);
@@ -36,7 +36,7 @@ void sub_81087C0(struct Sprite *);
void sub_810886C(struct Sprite *);
void sub_8108B2C(struct Sprite *);
void sub_8108B94(struct Sprite *);
void sub_8108BE0(struct Sprite *);
static void AnimWaterPulseBubble(struct Sprite *);
void sub_8108C08(struct Sprite *);
void sub_8108C54(struct Sprite *);
void AnimWaterPulseRing_Step(struct Sprite *);
@@ -328,7 +328,7 @@ const union AnimCmd *const gUnknown_08595204[] =
gUnknown_085951F8,
};
const struct SpriteTemplate gUnknown_08595208 =
const struct SpriteTemplate gWaterGunProjectileSpriteTemplate =
{
.tileTag = ANIM_TAG_SMALL_BUBBLES,
.paletteTag = ANIM_TAG_SMALL_BUBBLES,
@@ -339,7 +339,7 @@ const struct SpriteTemplate gUnknown_08595208 =
.callback = AnimThrowProjectile,
};
const struct SpriteTemplate gUnknown_08595220 =
const struct SpriteTemplate gWaterGunDropletSpriteTemplate =
{
.tileTag = ANIM_TAG_SMALL_BUBBLES,
.paletteTag = ANIM_TAG_SMALL_BUBBLES,
@@ -347,7 +347,7 @@ const struct SpriteTemplate gUnknown_08595220 =
.anims = gUnknown_08595204,
.images = NULL,
.affineAnims = gUnknown_08596208,
.callback = sub_8107894,
.callback = AnimWaterGunDroplet,
};
const struct SpriteTemplate gSmallBubblePairSpriteTemplate =
@@ -444,7 +444,7 @@ const union AffineAnimCmd *const gUnknown_085952F4[] =
gUnknown_085952D4,
};
const struct SpriteTemplate gUnknown_085952F8 =
const struct SpriteTemplate gWaterPulseBubbleSpriteTemplate =
{
.tileTag = ANIM_TAG_SMALL_BUBBLES,
.paletteTag = ANIM_TAG_SMALL_BUBBLES,
@@ -452,7 +452,7 @@ const struct SpriteTemplate gUnknown_085952F8 =
.anims = gUnknown_08595298,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_8108BE0,
.callback = AnimWaterPulseBubble,
};
const struct SpriteTemplate gUnknown_08595310 =
@@ -466,7 +466,7 @@ const struct SpriteTemplate gUnknown_08595310 =
.callback = sub_8108C54,
};
const struct SpriteTemplate gUnknown_08595328 =
const struct SpriteTemplate gWeatherBallWaterDownSpriteTemplate =
{
.tileTag = ANIM_TAG_SMALL_BUBBLES,
.paletteTag = ANIM_TAG_SMALL_BUBBLES,
@@ -474,7 +474,7 @@ const struct SpriteTemplate gUnknown_08595328 =
.anims = gUnknown_085952A0,
.images = NULL,
.affineAnims = gUnknown_085952F4,
.callback = sub_80A8EE4,
.callback = AnimWeatherBallDown,
};
extern const struct SpriteTemplate gWaterHitSplatSpriteTemplate;
@@ -844,7 +844,8 @@ static void AnimHydroCannonBeam(struct Sprite *sprite)
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
}
void sub_8107894(struct Sprite *sprite)
// Water droplet appears and drips down. Used by Water Gun on impact
static void AnimWaterGunDroplet(struct Sprite *sprite)
{
InitSpritePosToAnimTarget(sprite, TRUE);
sprite->data[0] = gBattleAnimArgs[4];
@@ -1503,7 +1504,7 @@ void sub_8108098(struct Sprite *sprite)
DestroyAnimSprite(sprite);
}
void sub_81080E4(u8 taskId)
void AnimTask_WaterSpoutLaunch(u8 taskId)
{
struct Task *task = &gTasks[taskId];
@@ -1686,7 +1687,7 @@ void sub_810851C(struct Sprite *sprite)
}
}
void sub_81085C8(u8 taskId)
void AnimTask_WaterSpoutRain(u8 taskId)
{
struct Task *task = &gTasks[taskId];
@@ -1804,7 +1805,7 @@ void sub_810886C(struct Sprite *sprite)
}
}
void sub_81088E4(u8 taskId)
void AnimTask_WaterSport(u8 taskId)
{
struct Task *task = &gTasks[taskId];
@@ -1944,7 +1945,7 @@ void sub_8108B94(struct Sprite *sprite)
}
}
void sub_8108BE0(struct Sprite *sprite)
static void AnimWaterPulseBubble(struct Sprite *sprite)
{
sprite->pos1.x = gBattleAnimArgs[0];
sprite->pos1.y = gBattleAnimArgs[1];