diff options
| author | garak <garakmon@gmail.com> | 2018-11-27 13:31:07 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-11-27 13:31:07 -0500 |
| commit | 50f00b0827a4952a12f90009bd992f23c80a56af (patch) | |
| tree | 6a5f78b04b42c162ed95cfc66c91a8b24f4051b2 /src/battle_tower.c | |
| parent | f02cb667bbddf4f4a1152c86cbf9616468e7f0d2 (diff) | |
| parent | c909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (diff) | |
Merge remote-tracking branch 'upstream/master' into fldeff
Diffstat (limited to 'src/battle_tower.c')
| -rw-r--r-- | src/battle_tower.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/battle_tower.c b/src/battle_tower.c index 000a03a5b..165b6bf64 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -28,8 +28,6 @@ #include "constants/moves.h" #include "constants/species.h" -extern u16 gUnknown_03006298[]; - extern void sub_81A4C30(void); extern const u8 *const *const gUnknown_085DD690[]; @@ -68,6 +66,9 @@ extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224166[]; EWRAM_DATA const struct BattleFrontierTrainer *gFacilityTrainers = NULL; EWRAM_DATA const struct FacilityMon *gFacilityTrainerMons = NULL; +// IWRAM common +u16 gUnknown_03006298[4]; + // This file's functions. static void sub_8161F94(void); static void sub_8162054(void); |