dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

more battle_anims_effects_2

Browse Source
This commit is contained in:
Sewef
2019-10-20 15:54:16 +02:00
committed by huderlem
parent 8531a17e10
commit def7a4a18a
3 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/battle_anim_scripts.s
+32 -32
View File
@@ -1800,11 +1800,11 @@ Move_SAFEGUARD:
monbg ANIM_ATK_PARTNER monbg ANIM_ATK_PARTNER
setalpha 8, 8 setalpha 8, 8
playsewithpan SE_W208, SOUND_PAN_ATTACKER playsewithpan SE_W208, SOUND_PAN_ATTACKER
createsprite gUnknown_08593C64, ANIM_ATTACKER, 2 createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2
delay 4 delay 4
createsprite gUnknown_08593C64, ANIM_ATTACKER, 2 createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2
delay 4 delay 4
createsprite gUnknown_08593C64, ANIM_ATTACKER, 2 createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2
waitforvisualfinish waitforvisualfinish
playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER
createvisualtask sub_8115A04, 2, 10, 0, 2, 0, 10, RGB_WHITE createvisualtask sub_8115A04, 2, 10, 0, 2, 0, 10, RGB_WHITE
@@ -2531,8 +2531,8 @@ HornDrillInContest:
Move_THRASH: Move_THRASH:
loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_IMPACT
loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_HANDS_AND_FEET
createvisualtask AnimTask_ThrashMoveMon, 2 createvisualtask AnimTask_ThrashMoveMonHorizontal, 2
createvisualtask sub_8104CA4, 2 createvisualtask AnimTask_ThrashMoveMonVertical, 2
createsprite gUnknown_08595EB0, ANIM_TARGET, 3, 1, 10, 0 createsprite gUnknown_08595EB0, ANIM_TARGET, 3, 1, 10, 0
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1
playsewithpan SE_W004, SOUND_PAN_TARGET playsewithpan SE_W004, SOUND_PAN_TARGET
@@ -3396,11 +3396,11 @@ ExtremeSpeedContinue:
loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 3 loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 3
waitforvisualfinish waitforvisualfinish
delay 1 delay 1
createvisualtask sub_8117F60, 2 createvisualtask AnimTask_ExtremeSpeedMoveTarget, 2
monbg ANIM_TARGET monbg ANIM_TARGET
setalpha 12, 8 setalpha 12, 8
delay 18 delay 18
createvisualtask sub_8105810, 2 createvisualtask AnimTask_ExtremeSpeedImpact, 2
delay 2 delay 2
playsewithpan SE_W004, SOUND_PAN_TARGET playsewithpan SE_W004, SOUND_PAN_TARGET
createsprite gBattleAnimSpriteTemplate_85973B8, ANIM_TARGET, 2, 1, 0, -12, 3 createsprite gBattleAnimSpriteTemplate_85973B8, ANIM_TARGET, 2, 1, 0, -12, 3
@@ -3413,7 +3413,7 @@ ExtremeSpeedContinue:
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_SpeedDust, 2 createvisualtask AnimTask_SpeedDust, 2
delay 10 delay 10
createvisualtask sub_810599C, 2 createvisualtask AnimTask_ExtremeSpeedMonReappear, 2
loopsewithpan SE_W104, SOUND_PAN_ATTACKER, 8, 4 loopsewithpan SE_W104, SOUND_PAN_ATTACKER, 8, 4
waitforvisualfinish waitforvisualfinish
restorebg restorebg
@@ -3437,20 +3437,20 @@ Move_UPROAR:
createvisualtask sub_8106D90, 2, 0 createvisualtask sub_8106D90, 2, 0
createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8
playsewithpan SE_W253, SOUND_PAN_ATTACKER playsewithpan SE_W253, SOUND_PAN_ATTACKER
createsprite gBattleAnimSpriteTemplate_8593BB8, ANIM_ATTACKER, 2, 0, 29, -12, 0 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 29, -12, 0
createsprite gBattleAnimSpriteTemplate_8593BB8, ANIM_ATTACKER, 2, 0, -12, -29, 1 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -12, -29, 1
delay 16 delay 16
createvisualtask sub_8106D90, 2, 0 createvisualtask sub_8106D90, 2, 0
createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8
playsewithpan SE_W253, SOUND_PAN_ATTACKER playsewithpan SE_W253, SOUND_PAN_ATTACKER
createsprite gBattleAnimSpriteTemplate_8593BB8, ANIM_ATTACKER, 2, 0, 12, -29, 1 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 12, -29, 1
createsprite gBattleAnimSpriteTemplate_8593BB8, ANIM_ATTACKER, 2, 0, -29, -12, 0 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -29, -12, 0
delay 16 delay 16
createvisualtask sub_8106D90, 2, 0 createvisualtask sub_8106D90, 2, 0
createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8
playsewithpan SE_W253, SOUND_PAN_ATTACKER playsewithpan SE_W253, SOUND_PAN_ATTACKER
createsprite gBattleAnimSpriteTemplate_8593BB8, ANIM_ATTACKER, 2, 0, 24, -24, 1 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, -24, 1
createsprite gBattleAnimSpriteTemplate_8593BB8, ANIM_ATTACKER, 2, 0, -24, -24, 0 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, -24, 0
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER clearmonbg ANIM_DEF_PARTNER
end end
@@ -5158,7 +5158,7 @@ Move_FAINT_ATTACK:
clearmonbg ANIM_ATTACKER clearmonbg ANIM_ATTACKER
invisible ANIM_ATTACKER invisible ANIM_ATTACKER
delay 1 delay 1
createvisualtask sub_8117F60, 2 createvisualtask AnimTask_ExtremeSpeedMoveTarget, 2
setalpha 12, 8 setalpha 12, 8
monbg ANIM_TARGET monbg ANIM_TARGET
delay 1 delay 1
@@ -7920,23 +7920,23 @@ Move_BATON_PASS:
Move_PERISH_SONG: Move_PERISH_SONG:
loadspritegfx ANIM_TAG_MUSIC_NOTES_2 loadspritegfx ANIM_TAG_MUSIC_NOTES_2
createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 0, 0, 0 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 0
createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 1, 1, 16 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 1, 1, 16
createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 2, 1, 32 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 2, 1, 32
createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 3, 2, 48 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 3, 2, 48
createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 4, 2, 64 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 4, 2, 64
createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 5, 0, 80 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 5, 0, 80
createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 6, 0, 96 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 6, 0, 96
createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 7, 1, 112 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 7, 1, 112
createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 8, 2, 128 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 8, 2, 128
createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 9, 0, 144 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 9, 0, 144
createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 10, 2, 160 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 10, 2, 160
createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 11, 0, 176 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 11, 0, 176
createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 12, 1, 192 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 12, 1, 192
createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 13, 3, 208 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 13, 3, 208
createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 14, 3, 224 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 14, 3, 224
createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 15, 0, 240 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 15, 0, 240
createsprite gUnknown_08593C24, ANIM_ATTACKER, 4, 15, 0, 0 createsprite gPerishSongMusicNote2SpriteTemplate, ANIM_ATTACKER, 4, 15, 0, 0
delay 20 delay 20
panse_1B SE_W195, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 panse_1B SE_W195, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
delay 80 delay 80
src/battle_anim_effects_2.c
+63 -63
View File
@@ -23,7 +23,7 @@ void sub_8103620(struct Sprite *);
void Anim_KinesisZapEnergy(struct Sprite *); void Anim_KinesisZapEnergy(struct Sprite *);
void Anim_SwordsDanceBlade(struct Sprite *); void Anim_SwordsDanceBlade(struct Sprite *);
void AnimSonicBoomProjectile(struct Sprite *); void AnimSonicBoomProjectile(struct Sprite *);
void sub_8103AA4(struct Sprite *); void AnimAirWaveProjectile(struct Sprite *);
void sub_8103FE8(struct Sprite *); void sub_8103FE8(struct Sprite *);
void AnimCoinThrow(struct Sprite *); void AnimCoinThrow(struct Sprite *);
void AnimFallingCoin(struct Sprite *); void AnimFallingCoin(struct Sprite *);
@@ -53,15 +53,15 @@ void AnimPinkHeart(struct Sprite *);
void AnimDevil(struct Sprite *); void AnimDevil(struct Sprite *);
void AnimFurySwipes(struct Sprite *); void AnimFurySwipes(struct Sprite *);
void AnimMovmentWaves(struct Sprite *); void AnimMovmentWaves(struct Sprite *);
void sub_8106E00(struct Sprite *); void AnimJaggedMusicNote(struct Sprite *);
void sub_8106F00(struct Sprite *); void AnimPerishSongMusicNote2(struct Sprite *);
void sub_8106F60(struct Sprite *); void AnimPerishSongMusicNote(struct Sprite *);
void sub_81070AC(struct Sprite *); void AnimGuardRing(struct Sprite *);
static void sub_81034D8(struct Sprite *); static void sub_81034D8(struct Sprite *);
static void sub_8103658(struct Sprite *); static void sub_8103658(struct Sprite *);
static void sub_8103680(struct Sprite *); static void sub_8103680(struct Sprite *);
static void AnimTask_WithdrawStep(u8); static void AnimTask_WithdrawStep(u8);
static void Anim_SwordsDanceBladeStep(struct Sprite *); static void AnimSwordsDanceBladeStep(struct Sprite *);
static void sub_8104018(struct Sprite *); static void sub_8104018(struct Sprite *);
static void AnimFallingCoin_Step(struct Sprite *); static void AnimFallingCoin_Step(struct Sprite *);
static void AnimBulletSeed_Step1(struct Sprite *); static void AnimBulletSeed_Step1(struct Sprite *);
@@ -77,8 +77,8 @@ static void ClonedMinizeSprite_Step(struct Sprite *);
static void AnimTask_SplashStep(u8); static void AnimTask_SplashStep(u8);
static void AnimTask_GrowAndShrinkStep(u8); static void AnimTask_GrowAndShrinkStep(u8);
static void ThrashMoveMonStep(u8); static void ThrashMoveMonStep(u8);
static void sub_8104D28(u8); static void ThrashMoveMon(u8);
static void sub_8104F54(u8); static void AnimTask_SketchDrawMon(u8);
static void AnimPencil_Step(struct Sprite *); static void AnimPencil_Step(struct Sprite *);
static void AnimSoftBoiledEgg_Step1(struct Sprite *); static void AnimSoftBoiledEgg_Step1(struct Sprite *);
static void AnimSoftBoiledEgg_Step2(struct Sprite *); static void AnimSoftBoiledEgg_Step2(struct Sprite *);
@@ -87,15 +87,15 @@ static void AnimSoftBoiledEgg_Step3_Callback1(struct Sprite *);
static void AnimSoftBoiledEgg_Step3_Callback2(struct Sprite *); static void AnimSoftBoiledEgg_Step3_Callback2(struct Sprite *);
static void AnimSoftBoiledEgg_Step4(struct Sprite *); static void AnimSoftBoiledEgg_Step4(struct Sprite *);
static void AnimSoftBoiledEgg_Step4_Callback(struct Sprite *); static void AnimSoftBoiledEgg_Step4_Callback(struct Sprite *);
static void sub_81057B8(u8); static void StretchAttacker_Step(u8);
static void sub_8105878(u8); static void ExtremeSpeedImpact_Step(u8);
static void sub_81059E0(u8); static void ExtremeSpeedMonReappear_Step(u8);
static void SpeedDust_Step1(u8); static void SpeedDust_Step1(u8);
static void FakeOutStep1(u8); static void FakeOutStep1(u8);
static void FakeOutStep2(u8); static void FakeOutStep2(u8);
static void AnimRedHeartProjectile_Step(struct Sprite *); static void AnimRedHeartProjectile_Step(struct Sprite *);
static void AnimRedHeartRising_Step(struct Sprite *); static void AnimRedHeartRising_Step(struct Sprite *);
static void sub_81063A8(u8); static void HeartsBackground_Step(u8);
static void sub_81065EC(u8); static void sub_81065EC(u8);
static void AnimOrbitFastStep(struct Sprite *); static void AnimOrbitFastStep(struct Sprite *);
static void AnimOrbitScatterStep(struct Sprite *); static void AnimOrbitScatterStep(struct Sprite *);
@@ -275,7 +275,7 @@ const struct SpriteTemplate gAirWaveProjectileSpriteTemplate =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_8103AA4, .callback = AnimAirWaveProjectile,
}; };
const union AffineAnimCmd gGrowingRingAffineAnimCmds[] = const union AffineAnimCmd gGrowingRingAffineAnimCmds[] =
@@ -1169,7 +1169,7 @@ const union AffineAnimCmd gUnknown_08593B98[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const struct SpriteTemplate gBattleAnimSpriteTemplate_8593BB8 = const struct SpriteTemplate gJaggedMusicNoteSpriteTemplate =
{ {
.tileTag = ANIM_TAG_JAGGED_MUSIC_NOTE, .tileTag = ANIM_TAG_JAGGED_MUSIC_NOTE,
.paletteTag = ANIM_TAG_JAGGED_MUSIC_NOTE, .paletteTag = ANIM_TAG_JAGGED_MUSIC_NOTE,
@@ -1177,84 +1177,84 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8593BB8 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_8106E00, .callback = AnimJaggedMusicNote,
}; };
const union AffineAnimCmd gUnknown_08593BD0[] = const union AffineAnimCmd gPerishSongMusicNoteAffineAnimCmds1[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 5), AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 5),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd gUnknown_08593BE0[] = const union AffineAnimCmd gPerishSongMusicNoteAffineAnimCmds2[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, -8, 16), AFFINEANIMCMD_FRAME(0x0, 0x0, -8, 16),
AFFINEANIMCMD_END_ALT(1), AFFINEANIMCMD_END_ALT(1),
}; };
const union AffineAnimCmd gUnknown_08593BF0[] = const union AffineAnimCmd gPerishSongMusicNoteAffineAnimCmds3[] =
{ {
AFFINEANIMCMD_FRAME(0x0, 0x0, 8, 16), AFFINEANIMCMD_FRAME(0x0, 0x0, 8, 16),
AFFINEANIMCMD_END_ALT(1), AFFINEANIMCMD_END_ALT(1),
}; };
const union AffineAnimCmd *const gUnknown_08593C00[] = const union AffineAnimCmd *const gPerishSongMusicNoteAffineAnimTable[] =
{ {
gUnknown_08593BD0, gPerishSongMusicNoteAffineAnimCmds1,
gUnknown_08593BE0, gPerishSongMusicNoteAffineAnimCmds2,
gUnknown_08593BF0, gPerishSongMusicNoteAffineAnimCmds3,
}; };
extern const union AnimCmd *const gMusicNotesAnimTable[]; extern const union AnimCmd *const gMusicNotesAnimTable[];
const struct SpriteTemplate gUnknown_08593C0C = const struct SpriteTemplate gPerishSongMusicNoteSpriteTemplate =
{ {
.tileTag = ANIM_TAG_MUSIC_NOTES_2, .tileTag = ANIM_TAG_MUSIC_NOTES_2,
.paletteTag = ANIM_TAG_MUSIC_NOTES_2, .paletteTag = ANIM_TAG_MUSIC_NOTES_2,
.oam = &gOamData_AffineNormal_ObjNormal_16x16, .oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gMusicNotesAnimTable, .anims = gMusicNotesAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_08593C00, .affineAnims = gPerishSongMusicNoteAffineAnimTable,
.callback = sub_8106F60, .callback = AnimPerishSongMusicNote,
}; };
const struct SpriteTemplate gUnknown_08593C24 = const struct SpriteTemplate gPerishSongMusicNote2SpriteTemplate =
{ {
.tileTag = ANIM_TAG_MUSIC_NOTES_2, .tileTag = ANIM_TAG_MUSIC_NOTES_2,
.paletteTag = ANIM_TAG_MUSIC_NOTES_2, .paletteTag = ANIM_TAG_MUSIC_NOTES_2,
.oam = &gOamData_AffineNormal_ObjNormal_16x16, .oam = &gOamData_AffineNormal_ObjNormal_16x16,
.anims = gMusicNotesAnimTable, .anims = gMusicNotesAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_08593C00, .affineAnims = gPerishSongMusicNoteAffineAnimTable,
.callback = sub_8106F00, .callback = AnimPerishSongMusicNote2,
}; };
const union AffineAnimCmd gUnknown_08593C3C[] = const union AffineAnimCmd gGuardRingAffineAnimCmds1[] =
{ {
AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0), AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd gUnknown_08593C4C[] = const union AffineAnimCmd gGuardRingAffineAnimCmds2[] =
{ {
AFFINEANIMCMD_FRAME(0x200, 0x100, 0, 0), AFFINEANIMCMD_FRAME(0x200, 0x100, 0, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd *const gUnknown_08593C5C[] = const union AffineAnimCmd *const gGuardRingAffineAnimTable[] =
{ {
gUnknown_08593C3C, gGuardRingAffineAnimCmds1,
gUnknown_08593C4C, gGuardRingAffineAnimCmds2,
}; };
const struct SpriteTemplate gUnknown_08593C64 = const struct SpriteTemplate gGuardRingSpriteTemplate =
{ {
.tileTag = ANIM_TAG_GUARD_RING, .tileTag = ANIM_TAG_GUARD_RING,
.paletteTag = ANIM_TAG_GUARD_RING, .paletteTag = ANIM_TAG_GUARD_RING,
.oam = &gOamData_AffineDouble_ObjBlend_64x32, .oam = &gOamData_AffineDouble_ObjBlend_64x32,
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_08593C5C, .affineAnims = gGuardRingAffineAnimTable,
.callback = sub_81070AC, .callback = AnimGuardRing,
}; };
void sub_8103448(struct Sprite *sprite) void sub_8103448(struct Sprite *sprite)
@@ -1456,10 +1456,10 @@ void Anim_SwordsDanceBlade(struct Sprite *sprite)
{ {
InitSpritePosToAnimAttacker(sprite, FALSE); InitSpritePosToAnimAttacker(sprite, FALSE);
sprite->callback = RunStoredCallbackWhenAffineAnimEnds; sprite->callback = RunStoredCallbackWhenAffineAnimEnds;
StoreSpriteCallbackInData6(sprite, Anim_SwordsDanceBladeStep); StoreSpriteCallbackInData6(sprite, AnimSwordsDanceBladeStep);
} }
static void Anim_SwordsDanceBladeStep(struct Sprite *sprite) static void AnimSwordsDanceBladeStep(struct Sprite *sprite)
{ {
sprite->data[0] = 6; sprite->data[0] = 6;
sprite->data[2] = sprite->pos1.x; sprite->data[2] = sprite->pos1.x;
@@ -1508,7 +1508,7 @@ void AnimSonicBoomProjectile(struct Sprite *sprite)
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
} }
static void sub_81039CC(struct Sprite *sprite) static void AnimAirWaveProjectile_Step2(struct Sprite *sprite)
{ {
if (sprite->data[0]-- <= 0) if (sprite->data[0]-- <= 0)
{ {
@@ -1517,7 +1517,7 @@ static void sub_81039CC(struct Sprite *sprite)
} }
} }
static void sub_8103A00(struct Sprite *sprite) static void AnimAirWaveProjectile_Step1(struct Sprite *sprite)
{ {
struct Task* task = &gTasks[sprite->data[7]]; struct Task* task = &gTasks[sprite->data[7]];
if (sprite->data[0] > task->data[5]) if (sprite->data[0] > task->data[5])
@@ -1546,11 +1546,11 @@ static void sub_8103A00(struct Sprite *sprite)
if (sprite->data[0]-- <= 0) if (sprite->data[0]-- <= 0)
{ {
sprite->data[0] = 30; sprite->data[0] = 30;
sprite->callback = sub_81039CC; sprite->callback = AnimAirWaveProjectile_Step2;
} }
} }
void sub_8103AA4(struct Sprite *sprite) void AnimAirWaveProjectile(struct Sprite *sprite)
{ {
s16 a; s16 a;
s16 b; s16 b;
@@ -1594,7 +1594,7 @@ void sub_8103AA4(struct Sprite *sprite)
sprite->data[5] = 0; sprite->data[5] = 0;
sprite->data[3] = sub_8151534(sub_8151534(b, a), sub_8151624(0x1C0)); sprite->data[3] = sub_8151534(sub_8151534(b, a), sub_8151624(0x1C0));
sprite->data[4] = sub_8151534(sub_8151534(c, a), sub_8151624(0x1C0)); sprite->data[4] = sub_8151534(sub_8151534(c, a), sub_8151624(0x1C0));
sprite->callback = sub_8103A00; sprite->callback = AnimAirWaveProjectile_Step1;
} }
} }
@@ -2284,7 +2284,7 @@ void AnimAngerMark(struct Sprite *sprite)
} }
// left/right movements // left/right movements
void AnimTask_ThrashMoveMon(u8 taskId) void AnimTask_ThrashMoveMonHorizontal(u8 taskId)
{ {
struct Task* task = &gTasks[taskId]; struct Task* task = &gTasks[taskId];
u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
@@ -2302,7 +2302,7 @@ static void ThrashMoveMonStep(u8 taskId)
} }
// up/down movements // up/down movements
void sub_8104CA4(u8 taskId) void AnimTask_ThrashMoveMonVertical(u8 taskId)
{ {
struct Task* task = &gTasks[taskId]; struct Task* task = &gTasks[taskId];
task->data[0] = GetAnimBattlerSpriteId(ANIM_ATTACKER); task->data[0] = GetAnimBattlerSpriteId(ANIM_ATTACKER);
@@ -2318,10 +2318,10 @@ void sub_8104CA4(u8 taskId)
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
task->data[2] *= -1; task->data[2] *= -1;
task->func = sub_8104D28; task->func = ThrashMoveMon;
} }
static void sub_8104D28(u8 taskId) static void ThrashMoveMon(u8 taskId)
{ {
struct Task* task = &gTasks[taskId]; struct Task* task = &gTasks[taskId];
if (++task->data[7] > 2) if (++task->data[7] > 2)
@@ -2410,10 +2410,10 @@ void sub_8104E74(u8 taskId)
params.initState = 1; params.initState = 1;
params.unused9 = 0; params.unused9 = 0;
ScanlineEffect_SetParams(params); ScanlineEffect_SetParams(params);
task->func = sub_8104F54; task->func = AnimTask_SketchDrawMon;
} }
static void sub_8104F54(u8 taskId) static void AnimTask_SketchDrawMon(u8 taskId)
{ {
struct Task* task = &gTasks[taskId]; struct Task* task = &gTasks[taskId];
@@ -2779,10 +2779,10 @@ void AnimTask_StretchAttacker(u8 taskId)
u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
task->data[0] = spriteId; task->data[0] = spriteId;
PrepareAffineAnimInTaskData(task, spriteId, gStretchAttackerAffineAnimCmds); PrepareAffineAnimInTaskData(task, spriteId, gStretchAttackerAffineAnimCmds);
task->func = sub_81057B8; task->func = StretchAttacker_Step;
} }
static void sub_81057B8(u8 taskId) static void StretchAttacker_Step(u8 taskId)
{ {
struct Task* task = &gTasks[taskId]; struct Task* task = &gTasks[taskId];
if (!RunAffineAnimFromTaskData(task)) if (!RunAffineAnimFromTaskData(task))
@@ -2793,7 +2793,7 @@ static void sub_81057B8(u8 taskId)
} }
} }
void sub_8105810(u8 taskId) void AnimTask_ExtremeSpeedImpact(u8 taskId)
{ {
struct Task* task = &gTasks[taskId]; struct Task* task = &gTasks[taskId];
task->data[0] = 0; task->data[0] = 0;
@@ -2813,10 +2813,10 @@ void sub_8105810(u8 taskId)
} }
task->data[15] = GetAnimBattlerSpriteId(ANIM_TARGET); task->data[15] = GetAnimBattlerSpriteId(ANIM_TARGET);
task->func = sub_8105878; task->func = ExtremeSpeedImpact_Step;
} }
static void sub_8105878(u8 taskId) static void ExtremeSpeedImpact_Step(u8 taskId)
{ {
struct Task* task = &gTasks[taskId]; struct Task* task = &gTasks[taskId];
@@ -2862,7 +2862,7 @@ static void sub_8105878(u8 taskId)
} }
} }
void sub_810599C(u8 taskId) void AnimTask_ExtremeSpeedMonReappear(u8 taskId)
{ {
struct Task* task = &gTasks[taskId]; struct Task* task = &gTasks[taskId];
task->data[0] = 0; task->data[0] = 0;
@@ -2873,10 +2873,10 @@ void sub_810599C(u8 taskId)
task->data[13] = 14; task->data[13] = 14;
task->data[14] = 2; task->data[14] = 2;
task->data[15] = GetAnimBattlerSpriteId(ANIM_ATTACKER); task->data[15] = GetAnimBattlerSpriteId(ANIM_ATTACKER);
task->func = sub_81059E0; task->func = ExtremeSpeedMonReappear_Step;
} }
static void sub_81059E0(u8 taskId) static void ExtremeSpeedMonReappear_Step(u8 taskId)
{ {
struct Task* task = &gTasks[taskId]; struct Task* task = &gTasks[taskId];
if (task->data[0] == 0 && ++task->data[1] > task->data[4]) if (task->data[0] == 0 && ++task->data[1] > task->data[4])
@@ -3246,10 +3246,10 @@ void AnimTask_HeartsBackground(u8 taskId)
AnimLoadCompressedBgGfx(animBg.bgId, &gUnknown_08C232E0, animBg.tilesOffset); AnimLoadCompressedBgGfx(animBg.bgId, &gUnknown_08C232E0, animBg.tilesOffset);
sub_80A6D60(&animBg, &gUnknown_08C23D78, 0); sub_80A6D60(&animBg, &gUnknown_08C23D78, 0);
LoadCompressedPalette(&gUnknown_08C23D50, animBg.paletteId * 16, 32); LoadCompressedPalette(&gUnknown_08C23D50, animBg.paletteId * 16, 32);
gTasks[taskId].func = sub_81063A8; gTasks[taskId].func = HeartsBackground_Step;
} }
static void sub_81063A8(u8 taskId) static void HeartsBackground_Step(u8 taskId)
{ {
struct BattleAnimBgData animBg; struct BattleAnimBgData animBg;
@@ -3656,7 +3656,7 @@ static void sub_8106DD4(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_8106E00(struct Sprite *sprite) void AnimJaggedMusicNote(struct Sprite *sprite)
{ {
int var1; int var1;
u8 battler = !gBattleAnimArgs[0] ? gBattleAnimAttacker : gBattleAnimTarget; u8 battler = !gBattleAnimArgs[0] ? gBattleAnimAttacker : gBattleAnimTarget;
@@ -3694,7 +3694,7 @@ static void sub_8106EC8(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
void sub_8106F00(struct Sprite *sprite) void AnimPerishSongMusicNote2(struct Sprite *sprite)
{ {
if (!sprite->data[0]) if (!sprite->data[0])
{ {
@@ -3709,7 +3709,7 @@ void sub_8106F00(struct Sprite *sprite)
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
void sub_8106F60(struct Sprite *sprite) void AnimPerishSongMusicNote(struct Sprite *sprite)
{ {
int index; int index;
int var2; int var2;
@@ -3786,7 +3786,7 @@ static void sub_810703C(struct Sprite *sprite)
} }
} }
void sub_81070AC(struct Sprite *sprite) void AnimGuardRing(struct Sprite *sprite)
{ {
if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimAttacker))) if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimAttacker)))
{ {
src/battle_anim_utility_funcs.c
+4 -4
View File
@@ -36,7 +36,7 @@ static void sub_8117500(u8);
static void sub_81175C4(u32, u16); static void sub_81175C4(u32, u16);
static void sub_81176D8(u8); static void sub_81176D8(u8);
static void sub_8117A60(u8); static void sub_8117A60(u8);
static void sub_8117FD0(u8); static void ExtremSpeedMoveTarget_Step(u8);
const u16 gUnknown_08597418 = RGB(31, 31, 31); const u16 gUnknown_08597418 = RGB(31, 31, 31);
@@ -1036,7 +1036,7 @@ void sub_8117F30(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_8117F60(u8 taskId) void AnimTask_ExtremeSpeedMoveTarget(u8 taskId)
{ {
if (IsContest()) if (IsContest())
{ {
@@ -1046,12 +1046,12 @@ void sub_8117F60(u8 taskId)
{ {
gTasks[taskId].data[0] = gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].invisible; gTasks[taskId].data[0] = gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].invisible;
gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].invisible = 1; gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].invisible = 1;
gTasks[taskId].func = sub_8117FD0; gTasks[taskId].func = ExtremSpeedMoveTarget_Step;
gAnimVisualTaskCount--; gAnimVisualTaskCount--;
} }
} }
static void sub_8117FD0(u8 taskId) static void ExtremSpeedMoveTarget_Step(u8 taskId)
{ {
if (gBattleAnimArgs[7] == 0x1000) if (gBattleAnimArgs[7] == 0x1000)
{ {