diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-26 17:26:11 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-26 17:26:11 +0100 |
| commit | 59f64c622bf2ed7a0fcc6d45975813bc55c84141 (patch) | |
| tree | 77afc2a812d2c827614749bc7c7989dd5c1922ec /src/battle_2.c | |
| parent | 1bb5b1fd07260cd027d9504a0debfdc294cebc9f (diff) | |
name more battlescripts
Diffstat (limited to 'src/battle_2.c')
| -rw-r--r-- | src/battle_2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_2.c b/src/battle_2.c index b03e96622..8afca2f10 100644 --- a/src/battle_2.c +++ b/src/battle_2.c @@ -4083,7 +4083,7 @@ static void HandleTurnActionSelectionState(void) && gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000) && gBattleBufferB[gActiveBank][1] == ACTION_RUN) { - gSelectionBattleScripts[gActiveBank] = BattleScript_82DB9BA; + gSelectionBattleScripts[gActiveBank] = BattleScript_AskIfWantsToForfeitMatch; gBattleCommunication[gActiveBank] = 8; *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE; *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN; @@ -4093,13 +4093,13 @@ static void HandleTurnActionSelectionState(void) && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) && gBattleBufferB[gActiveBank][1] == ACTION_RUN) { - BattleScriptExecute(BattleScript_82DAAFE); + BattleScriptExecute(BattleScript_PrintCantRunFromTrainer); gBattleCommunication[gActiveBank] = 1; } - else if (IsRunningFromBattleImpossible() != 0 + else if (IsRunningFromBattleImpossible() && gBattleBufferB[gActiveBank][1] == ACTION_RUN) { - gSelectionBattleScripts[gActiveBank] = BattleScript_82DAB0B; + gSelectionBattleScripts[gActiveBank] = BattleScript_PrintCantEscapeFromBattle; gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT; *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE; *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN; |