From d9287f32614fa93e9a962154cb1b9fd38039df58 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 4 Dec 2018 12:15:13 -0500 Subject: [PATCH] extern gTower trainer data --- include/battle_tower.h | 5 +++++ src/battle_tower.c | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/battle_tower.h b/include/battle_tower.h index e08f5e5c91..68f495524a 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -33,6 +33,11 @@ struct FacilityMon u8 nature; }; +extern const u8 gTowerMaleFacilityClasses[30]; +extern const u8 gTowerMaleTrainerGfxIds[30]; +extern const u8 gTowerFemaleFacilityClasses[20]; +extern const u8 gTowerFemaleTrainerGfxIds[20]; + extern u16 gUnknown_03006298[]; extern const struct BattleFrontierTrainer *gFacilityTrainers; diff --git a/src/battle_tower.c b/src/battle_tower.c index f00db4c1df..7bc354c1db 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -263,8 +263,6 @@ const u8 gTowerFemaleTrainerGfxIds[] = EVENT_OBJ_GFX_LASS }; -extern const u8 sRubyFacilityClassToEmerald[82][2]; -/* const u8 sRubyFacilityClassToEmerald[82][2] = { {0x00, 0x0b}, @@ -344,7 +342,6 @@ const u8 sRubyFacilityClassToEmerald[82][2] = {0x4c, 0x4a}, {0x00, 0x00} }; -*/ const u8 *const gUnknown_085DCFD8[] = {