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

Adjust faint battler script (#8137)

Browse Source
This commit is contained in:
Alex 2025-11-04 21:57:49 +01:00 committed by GitHub
parent 41aba41838
commit dea7d02e76
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
data/battle_scripts_1.s
View File

@ -4394,20 +4394,21 @@ BattleScript_EffectCamouflage::
goto BattleScript_MoveEnd
BattleScript_FaintBattler::
tryillusionoff BS_SCRIPTING
tryillusionoff BS_FAINTED
tryactivategulpmissile
playfaintcry BS_SCRIPTING
playfaintcry BS_FAINTED
pause B_WAIT_TIME_LONG
dofaintanimation BS_SCRIPTING
dofaintanimation BS_FAINTED
copybyte sBATTLER, gBattlerFainted @ for message
printstring STRINGID_BATTLERFAINTED
cleareffectsonfaint BS_SCRIPTING
cleareffectsonfaint BS_FAINTED
trytoclearprimalweather
tryrevertweatherform
flushtextbox
waitanimation
tryactivatesoulheart
tryactivatereceiver BS_SCRIPTING
trytrainerslidemsgfirstoff BS_SCRIPTING
tryactivatereceiver BS_FAINTED
trytrainerslidemsgfirstoff BS_FAINTED
return

2
src/battle_script_commands.c
View File

@ -4203,7 +4203,7 @@ static void Cmd_tryfaintmon(void)
if (cmd->battler == BS_ATTACKER)
TryUpdateEvolutionTracker(IF_DEFEAT_X_WITH_ITEMS, 1, MOVE_NONE);
gBattleScripting.battler = battler;
gBattlerFainted = battler;
faintScript = BattleScript_FaintBattler;
if (!(gAbsentBattlerFlags & (1u << battler))
&& !IsBattlerAlive(battler))