diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2016-11-11 20:07:15 -0600 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-11-11 18:07:15 -0800 |
| commit | 510f104706cb1420b41a0ca8d96cb2b522b38c01 (patch) | |
| tree | 94dc7a8da5d3374f3c51cdac2d88dbec2b22509f /src/battle_setup.c | |
| parent | 52aba81f3498eb2cdccbb2819bf2202cd8b4b755 (diff) | |
more cleanup (#98)
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index 869f713ca..15b09645f 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -121,15 +121,15 @@ extern struct Pokemon gEnemyParty[]; extern struct Pokemon gPlayerParty[]; extern struct Trainer gTrainers[]; -extern u16 gTrainerBattleMode; -extern u16 gTrainerBattleOpponent; -extern u16 gTrainerMapObjectLocalId; -extern u8 *gTrainerIntroSpeech; -extern u8 *gTrainerDefeatSpeech; -extern u8 *gTrainerVictorySpeech; -extern u8 *gTrainerCannotBattleSpeech; -extern u8 *gTrainerBattleScriptReturnAddress; -extern u8 *gTrainerBattleEndScript; +EWRAM_DATA u16 gTrainerBattleMode = 0; +EWRAM_DATA u16 gTrainerBattleOpponent = 0; +EWRAM_DATA u16 gTrainerMapObjectLocalId = 0; +EWRAM_DATA u8 *gTrainerIntroSpeech = NULL; +EWRAM_DATA u8 *gTrainerDefeatSpeech = NULL; +EWRAM_DATA u8 *gTrainerVictorySpeech = NULL; +EWRAM_DATA u8 *gTrainerCannotBattleSpeech = NULL; +EWRAM_DATA u8 *gTrainerBattleScriptReturnAddress = NULL; +EWRAM_DATA u8 *gTrainerBattleEndScript = NULL; extern struct TrainerEyeTrainer gTrainerEyeTrainers[]; |