From 0768c43020af6f5ffab9c45920fdeef68f0f4e85 Mon Sep 17 00:00:00 2001 From: voloved <36523934+voloved@users.noreply.github.com> Date: Sat, 8 Apr 2023 05:06:01 -0400 Subject: [PATCH] Fall through to IsRunningFromBattleImpossible logic --- Allow-Running-From-Trainer-Battles.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Allow-Running-From-Trainer-Battles.md b/Allow-Running-From-Trainer-Battles.md index e4f574d..60ffda5 100644 --- a/Allow-Running-From-Trainer-Battles.md +++ b/Allow-Running-From-Trainer-Battles.md @@ -117,11 +117,15 @@ index 7f36cacc8f..2a25e074f6 100644 { - BattleScriptExecute(BattleScript_PrintCantRunFromTrainer); - gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN; -+ gBattleCommunication[gActiveBattler]++; ++ ; // Allow to passthrough to the below logic of IsRunningFromBattleImpossible } - else if (IsRunningFromBattleImpossible() != BATTLE_RUN_SUCCESS +- else if (IsRunningFromBattleImpossible() != BATTLE_RUN_SUCCESS ++ if (IsRunningFromBattleImpossible() != BATTLE_RUN_SUCCESS && gBattleBufferB[gActiveBattler][1] == B_ACTION_RUN) { + gSelectionBattleScripts[gActiveBattler] = BattleScript_PrintCantEscapeFromBattle; + gBattleCommunication[gActiveBattler] = STATE_SELECTION_SCRIPT; + *(gBattleStruct->selectionScriptFinished + gActiveBattler) = FALSE; ``` ```diff