diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-26 15:32:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-26 15:32:39 -0500 |
| commit | a2c6174ee995f8980bcd38d3199ab2e395cca2ae (patch) | |
| tree | b5a1b7af6d63cd1064db1a59e9961e5906c0ebf4 /src/battle_main.c | |
| parent | 905912e2784c116e28dfe22a95b149f7ef00f640 (diff) | |
| parent | 97d2555fad45c046862b97cf84c443b6935928a6 (diff) | |
Merge pull request #241 from GriffinRichards/doc-viridian
Document Viridian City scripts and adjacent routes
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index fd8aeffbc..76f373f8f 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -50,6 +50,7 @@ #include "cable_club.h" #include "constants/abilities.h" #include "constants/battle_move_effects.h" +#include "constants/battle_setup.h" #include "constants/hold_effects.h" #include "constants/items.h" #include "constants/moves.h" @@ -3716,12 +3717,12 @@ static void HandleEndTurn_BattleLost(void) } else { - if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && ScrSpecial_GetTrainerBattleMode() == 9) + if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && ScrSpecial_GetTrainerBattleMode() == TRAINER_BATTLE_EARLY_RIVAL) { - if (sub_80803D8() & 1) - gBattleCommunication[MULTISTRING_CHOOSER] = 1; + if (GetRivalBattleFlags() & RIVAL_BATTLE_HEAL_AFTER) + gBattleCommunication[MULTISTRING_CHOOSER] = 1; // Dont do white out text else - gBattleCommunication[MULTISTRING_CHOOSER] = 2; + gBattleCommunication[MULTISTRING_CHOOSER] = 2; // Do white out text gBattlerAttacker = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); } else |