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

Fix substitute graphic not disappearing after using a pivor move (#8340)

Browse Source
This commit is contained in:
FosterProgramming 2025-11-27 19:09:40 +01:00 committed by GitHub
parent fbc640d692
commit 7085d30263
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
data/battle_scripts_1.s
View File

@ -156,7 +156,11 @@ BattleScript_EffectShedTail::
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
moveendto MOVEEND_ATTACKER_VISIBLE moveendto MOVEEND_ATTACKER_VISIBLE
moveendfrom MOVEEND_TARGET_VISIBLE moveendfrom MOVEEND_TARGET_VISIBLE
goto BattleScript_MoveSwitchOpenPartyScreen call BattleScript_MoveSwitchOpenPartyScreenReturnWithNoAnim
switchinanim BS_ATTACKER, FALSE, TRUE
waitstate
switchineffects BS_ATTACKER
end
BattleScript_EffectPsychicNoise:: BattleScript_EffectPsychicNoise::
printstring STRINGID_PKMNPREVENTEDFROMHEALING printstring STRINGID_PKMNPREVENTEDFROMHEALING
@ -308,6 +312,14 @@ BattleScript_MoveSwitch:
printstring STRINGID_PKMNWENTBACK printstring STRINGID_PKMNWENTBACK
waitmessage B_WAIT_TIME_SHORT waitmessage B_WAIT_TIME_SHORT
BattleScript_MoveSwitchOpenPartyScreen:: BattleScript_MoveSwitchOpenPartyScreen::
call BattleScript_MoveSwitchOpenPartyScreenReturnWithNoAnim
switchinanim BS_ATTACKER, FALSE, FALSE
waitstate
switchineffects BS_ATTACKER
BattleScript_MoveSwitchEnd:
end
BattleScript_MoveSwitchOpenPartyScreenReturnWithNoAnim:
openpartyscreen BS_ATTACKER, BattleScript_MoveSwitchEnd openpartyscreen BS_ATTACKER, BattleScript_MoveSwitchEnd
waitstate waitstate
returntoball BS_ATTACKER, FALSE returntoball BS_ATTACKER, FALSE
@ -320,11 +332,7 @@ BattleScript_MoveSwitchOpenPartyScreen::
printstring STRINGID_EMPTYSTRING3 printstring STRINGID_EMPTYSTRING3
waitmessage 1 waitmessage 1
printstring STRINGID_SWITCHINMON printstring STRINGID_SWITCHINMON
switchinanim BS_ATTACKER, FALSE, TRUE return
waitstate
switchineffects BS_ATTACKER
BattleScript_MoveSwitchEnd:
end
BattleScript_EffectPledge:: BattleScript_EffectPledge::
attackcanceler attackcanceler