Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fall through to IsRunningFromBattleImpossible logic

voloved 2023-04-08 05:06:01 -04:00
parent 6bce29537d
commit 0768c43020
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Allow-Running-From-Trainer-Battles.md

@ -117,11 +117,15 @@ index 7f36cacc8f..2a25e074f6 100644
{ {
- BattleScriptExecute(BattleScript_PrintCantRunFromTrainer); - BattleScriptExecute(BattleScript_PrintCantRunFromTrainer);
- gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN; - 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) && gBattleBufferB[gActiveBattler][1] == B_ACTION_RUN)
{ {
gSelectionBattleScripts[gActiveBattler] = BattleScript_PrintCantEscapeFromBattle;
gBattleCommunication[gActiveBattler] = STATE_SELECTION_SCRIPT;
*(gBattleStruct->selectionScriptFinished + gActiveBattler) = FALSE;
``` ```
```diff ```diff