diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-21 23:12:36 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-21 23:12:36 +0100 |
| commit | bcffcb0c1cd1d9b9a223fa8029f33b4c3c926575 (patch) | |
| tree | cd9e57cb761cad0ad93d5024d3f8c84e49e2bd9d /src/battle_setup.c | |
| parent | df479661ffd0c270e4a8c35f37285d5d3988f592 (diff) | |
| parent | a705a863d1f59411a6f18fdd95e81de76f66fd66 (diff) | |
pokeblock merge conflicts
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index 3d4f5afcc..be23a28c9 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -88,9 +88,6 @@ extern u32 GetGameStat(u8 statId); extern u32 gBattleTypeFlags; extern u8 gBattleOutcome; extern void (*gFieldCallback)(void); -extern u8 gApproachingTrainerId; -extern u8 gNoOfApproachingTrainers; -extern u16 gUnknown_03006080; // this file's functions static void DoBattlePikeWildBattle(void); @@ -113,7 +110,7 @@ static void HandleRematchVarsOnBattleEnd(void); static const u8 *GetIntroSpeechOfApproachingTrainer(void); static const u8 *GetTrainerCantBattleSpeech(void); -// ewram data +// ewram vars EWRAM_DATA static u16 sTrainerBattleMode = 0; EWRAM_DATA u16 gTrainerBattleOpponent_A = 0; EWRAM_DATA u16 gTrainerBattleOpponent_B = 0; |