diff options
| author | Sewef <elagroum@gmail.com> | 2019-10-16 19:35:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-16 19:35:33 +0200 |
| commit | 19fb0fb2205cf719daeb705098c685e2062d3c83 (patch) | |
| tree | f869cb7ec87f204f236a0d173e54b047adfd97eb /src/battle_setup.c | |
| parent | ed1f5a74556d3a856f868e1b67edd2453122cff6 (diff) | |
| parent | 60a592a2c32d07d47c892204659a8576017584d1 (diff) | |
Merge branch 'master' into patch-2
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index c2d7cb6c6..3c9de6b79 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1273,7 +1273,7 @@ void BattleSetup_StartTrainerBattle(void) MarkApproachingPyramidTrainersAsBattled(); } - else if (sub_81D5C18()) + else if (InTrainerHillChallenge()) { gBattleTypeFlags |= BATTLE_TYPE_TRAINER_HILL; @@ -1291,7 +1291,7 @@ void BattleSetup_StartTrainerBattle(void) gUnknown_03006080 = 0; gMain.savedCallback = CB2_EndTrainerBattle; - if (InBattlePyramid() || sub_81D5C18()) + if (InBattlePyramid() || InTrainerHillChallenge()) sub_80B0828(); else DoTrainerBattle(); @@ -1307,7 +1307,7 @@ static void CB2_EndTrainerBattle(void) } else if (IsPlayerDefeated(gBattleOutcome) == TRUE) { - if (InBattlePyramid() || sub_81D5C18()) + if (InBattlePyramid() || InTrainerHillChallenge()) SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); else SetMainCallback2(CB2_WhiteOut); @@ -1315,7 +1315,7 @@ static void CB2_EndTrainerBattle(void) else { SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); - if (!InBattlePyramid() && !sub_81D5C18()) + if (!InBattlePyramid() && !InTrainerHillChallenge()) { RegisterTrainerInMatchCall(); SetBattledTrainersFlags(); @@ -1361,7 +1361,7 @@ void ShowTrainerIntroSpeech(void) sub_80982B8(); } - else if (sub_81D5C18()) + else if (InTrainerHillChallenge()) { if (gNoOfApproachingTrainers == 0 || gNoOfApproachingTrainers == 1) CopyTrainerHillTrainerText(2, LocalIdToHillTrainerId(gSpecialVar_LastTalked)); |