mirror of https://github.com/pret/pokeemerald.git
No running from double battles
parent
52643a159f
commit
d6f9926bee
|
@ -217,7 +217,7 @@ void SwitchPartyOrder(u8 battler)
|
||||||
&& gBattleBufferB[gActiveBattler][1] == B_ACTION_RUN)
|
&& gBattleBufferB[gActiveBattler][1] == B_ACTION_RUN)
|
||||||
{
|
{
|
||||||
- gBattleCommunication[gActiveBattler]++;
|
- gBattleCommunication[gActiveBattler]++;
|
||||||
+ if (IsTrainerCantRunFrom())
|
+ if (IsTrainerCantRunFrom() || IsDoubleBattle())
|
||||||
+ {
|
+ {
|
||||||
+ BattleScriptExecute(BattleScript_PrintCantRunFromTrainer);
|
+ BattleScriptExecute(BattleScript_PrintCantRunFromTrainer);
|
||||||
+ gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN;
|
+ gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN;
|
||||||
|
|
Loading…
Reference in New Issue