Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes Expanding Force and Spectral Thief move animations (#6185)

Browse Source
This commit is contained in:
PhallenTree 2025-02-09 21:34:48 +00:00 committed by GitHub
parent 99cb40d896
commit cf5b95cee8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
data/battle_anim_scripts.s
View File

@ -2228,7 +2228,7 @@ gBattleAnimMove_ZenHeadbutt::
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 4, 1
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 1, 2
createsprite gAquaTailHitSpriteTemplate, ANIM_TARGER, 131, 0, 0, 1, 1
createsprite gAquaTailHitSpriteTemplate, ANIM_TARGET, 131, 0, 0, 1, 1
playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
waitforvisualfinish
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 4, 0, 0
@ -2246,22 +2246,22 @@ gBattleAnimMove_MirrorShot::
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 10, RGB_WHITEALPHA
createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 12, 12, RGB(21, 21, 21)
waitforvisualfinish
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGER, 131, 1, 2
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 131, 1, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET
delay 3
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGER, 131, 1, 2
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 131, 1, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET
delay 3
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGER, 131, 1, 2
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 131, 1, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET
delay 3
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGER, 131, 1, 2
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 131, 1, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET
delay 3
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGER, 131, 1, 2
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 131, 1, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET
delay 3
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGER, 131, 1, 2
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 131, 1, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET
waitforvisualfinish
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 10, 0, RGB_WHITEALPHA
@ -11974,7 +11974,7 @@ PrismaticLaserRain:
return
gBattleAnimMove_SpectralThief::
choosetwoturnanim SpectralThiefSteal SpectralThiefUnleash
choosetwoturnanim SpectralThiefUnleash SpectralThiefSteal
SpectralThiefUnleash:
loadspritegfx ANIM_TAG_HANDS_AND_FEET @Black Colour
loadspritegfx ANIM_TAG_QUICK_GUARD_HAND @Black Colour
@ -13242,7 +13242,7 @@ gBattleAnimMove_MagicPowder::
gBattleAnimMove_DragonDarts::
loadspritegfx ANIM_TAG_DREEPY_SHINY
loadspritegfx ANIM_TAG_DREEPY
loadspritegfx ANIM_TAG_AIR_WAVE
loadspritegfx ANIM_TAG_AIR_WAVE
loadspritegfx ANIM_TAG_EXPLOSION
playsewithpan SE_FALL, SOUND_PAN_ATTACKER
createdragondartsprite ANIM_TARGET, 2, 0x0, 0x0, 0x19
@ -14038,9 +14038,9 @@ gBattleAnimMove_ExpandingForce::
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, F_PAL_ATTACKER, 2, 0, 8, RGB(31, 23, 0)
waitforvisualfinish
playsewithpan SE_M_MEGA_KICK, SOUND_PAN_TARGET
choosetwoturnanim EXPANDING_FORCE_SINGLE_TARGET EXPANDING_FORCE_BOTH_TARGETS
choosetwoturnanim ExpandingForceSingleTarget ExpandingForceBothTargets
EXPANDING_FORCE_SINGLE_TARGET:
ExpandingForceSingleTarget:
createsprite gSpriteTemplate_SpiritBreakChargeBall, ANIM_TARGET, 1, ANIM_TARGET
waitforvisualfinish
createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 0x2, 0x0, 0x1, 0x18, 0x1, 0x0
@ -14050,7 +14050,7 @@ EXPANDING_FORCE_SINGLE_TARGET:
clearmonbg ANIM_DEF_PARTNER
end
EXPANDING_FORCE_BOTH_TARGETS:
ExpandingForceBothTargets:
createsprite gSpriteTemplate_SpiritBreakChargeBall, ANIM_TARGET, 1, ANIM_TARGET
createsprite gSpriteTemplate_SpiritBreakChargeBall, ANIM_TARGET, 1, ANIM_DEF_PARTNER
waitforvisualfinish
@ -14182,9 +14182,9 @@ gBattleAnimMove_MeteorBeam::
loadspritegfx ANIM_TAG_ROCKS
fadetobg BG_COSMIC
waitbgfadeout
choosetwoturnanim METEOR_BEAM_CHARGE METEOR_BEAM_BLAST
choosetwoturnanim MeteorBeamCharge MeteorBeamBlast
METEOR_BEAM_CHARGE:
MeteorBeamCharge:
createvisualtask AnimTask_StartSlidingBg, 0x5, 0x0, 0xFC00, FALSE, 0xffff
waitbgfadein
monbg ANIM_ATK_PARTNER
@ -14197,7 +14197,7 @@ METEOR_BEAM_CHARGE:
call UnsetPsychicBg
end
METEOR_BEAM_BLAST:
MeteorBeamBlast:
createvisualtask AnimTask_StartSlidingBg, 0x5, 0xf700, 0x0, TRUE, 0xffff @;Scroll right/left
waitbgfadein
monbg ANIM_TARGET

5
data/battle_scripts_1.s
View File

@ -1291,11 +1291,16 @@ BattleScript_VCreateStatLossRet:
return
BattleScript_SpectralThiefSteal::
setbyte sB_ANIM_TURN, 1
playmoveanimation BS_ATTACKER, MOVE_SPECTRAL_THIEF
waitanimation
setbyte sB_ANIM_TURN, 0
printstring STRINGID_SPECTRALTHIEFSTEAL
waitmessage B_WAIT_TIME_LONG
setbyte sB_ANIM_ARG2, 0
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
spectralthiefprintstats
flushtextbox
goto BattleScript_EffectSpectralThiefFromDamage
BattleScript_EffectSpectralThief::

5
src/battle_script_commands.c
View File

@ -2270,6 +2270,11 @@ static void Cmd_attackanimation(void)
gBattlescriptCurrInstr = cmd->nextInstr;
return;
}
// handle special move animations
if (gMovesInfo[gCurrentMove].effect == EFFECT_EXPANDING_FORCE && moveTarget & MOVE_TARGET_BOTH && CountAliveMonsInBattle(BATTLE_ALIVE_SIDE, BATTLE_OPPOSITE(gBattlerAttacker) > 1))
gBattleScripting.animTurn = 1;
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
{
u8 multihit;