diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-03-05 14:38:26 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-03-05 14:38:26 -0500 |
| commit | 83137b40053bbea4c5288e269ed913746dd9713f (patch) | |
| tree | c30e0e3d4e88caf9e9f9fb6345c85bdd8aa071d2 /src/battle_main.c | |
| parent | 7f81fdc8df5247c926228b784f6878dc3edac051 (diff) | |
| parent | 3d5d298c63a88c1a581b58d44dcc3706a7799c04 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into dodrio_berry_picking
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index e7d02c673..bbfcf5cf9 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -641,17 +641,17 @@ void CB2_InitBattle(void) if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) { if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) - HelpSystem_SetSomeVariable2(0x19); + SetHelpContext(HELPCONTEXT_TRAINER_BATTLE_DOUBLE); else - HelpSystem_SetSomeVariable2(0x18); + SetHelpContext(HELPCONTEXT_TRAINER_BATTLE_SINGLE); } else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) { - HelpSystem_SetSomeVariable2(0x1A); + SetHelpContext(HELPCONTEXT_SAFARI_BATTLE); } else { - HelpSystem_SetSomeVariable2(0x17); + SetHelpContext(HELPCONTEXT_WILD_BATTLE); } } } @@ -3713,7 +3713,7 @@ static void HandleEndTurn_BattleLost(void) } else { - if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && ScrSpecial_GetTrainerBattleMode() == TRAINER_BATTLE_EARLY_RIVAL) + if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && GetTrainerBattleMode() == TRAINER_BATTLE_EARLY_RIVAL) { if (GetRivalBattleFlags() & RIVAL_BATTLE_HEAL_AFTER) gBattleCommunication[MULTISTRING_CHOOSER] = 1; // Dont do white out text |