diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-09-21 10:10:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-21 10:10:04 -0500 |
| commit | b787f8ca045b03521f03d84df8ea06ff87a2ab01 (patch) | |
| tree | 63467bde2f08295e231eec02610f6e041ca38944 /src/battle_setup.c | |
| parent | 25e469b6644377ec4e4f82eab294437a61ea7635 (diff) | |
| parent | 66fd9b2ddfef147159033271046f62b4f2c8adad (diff) | |
Merge pull request #335 from DizzyEggg/battledoc
Document some not labeled battle things
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index 17ab20ccd..89a3d9a2c 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -75,7 +75,7 @@ extern void sub_81D6384(void); extern void sub_81D61E8(void); extern void sub_80982B8(void); extern void sub_81A9EDC(u16 a0); -extern void sub_81D572C(u8 a0, u16 arg1); +extern void CopyTrainerHillTrainerText(u8 a0, u16 arg1); // this file's functions static void DoBattlePikeWildBattle(void); @@ -1281,7 +1281,7 @@ void BattleSetup_StartTrainerBattle(void) } else if (sub_81D5C18()) { - gBattleTypeFlags |= BATTLE_TYPE_x4000000; + gBattleTypeFlags |= BATTLE_TYPE_TRAINER_HILL; if (gNoOfApproachingTrainers == 2) sub_81D639C(); @@ -1370,9 +1370,9 @@ void ShowTrainerIntroSpeech(void) else if (sub_81D5C18()) { if (gNoOfApproachingTrainers == 0 || gNoOfApproachingTrainers == 1) - sub_81D572C(2, sub_81D6180(gSpecialVar_LastTalked)); + CopyTrainerHillTrainerText(2, sub_81D6180(gSpecialVar_LastTalked)); else - sub_81D572C(2, sub_81D6180(gEventObjects[gApproachingTrainers[gApproachingTrainerId].eventObjectId].localId)); + CopyTrainerHillTrainerText(2, sub_81D6180(gEventObjects[gApproachingTrainers[gApproachingTrainerId].eventObjectId].localId)); sub_80982B8(); } |