From 462e7c82956ed120ab8fce453f2326ef9bfbc9a6 Mon Sep 17 00:00:00 2001 From: garak Date: Sun, 2 Dec 2018 23:22:42 -0500 Subject: begin batle tower data --- src/battle_tower.c | 828 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 804 insertions(+), 24 deletions(-) (limited to 'src/battle_tower.c') diff --git a/src/battle_tower.c b/src/battle_tower.c index 165b6bf64..e865d4656 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -27,37 +27,14 @@ #include "constants/event_objects.h" #include "constants/moves.h" #include "constants/species.h" +#include "constants/easy_chat.h" extern void sub_81A4C30(void); -extern const u8 *const *const gUnknown_085DD690[]; extern const u16 gBattleFrontierHeldItems[]; -extern const u8 sRubyFacilityClassToEmerald[82][2]; extern const u16 gUnknown_085DFA46[]; -extern const struct FacilityMon gSlateportBattleTentMons[]; -extern const struct FacilityMon gVerdanturfBattleTentMons[]; -extern const struct FacilityMon gFallarborBattleTentMons[]; extern const struct FacilityMon gBattleFrontierMons[]; extern const struct BattleFrontierTrainer gBattleFrontierTrainers[]; -extern const struct BattleFrontierTrainer gSlateportBattleTentTrainers[]; -extern const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[]; -extern const struct BattleFrontierTrainer gFallarborBattleTentTrainers[]; - -struct -{ - u32 facilityClass; - const u8 *const *strings; -} extern const gUnknown_085DD500[50]; - -struct -{ - u16 species; - u8 fixedIV; - u8 level; - u8 nature; - u8 evs[6]; - u16 moves[4]; -} extern const sStevenMons[3]; extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224157[]; extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224166[]; @@ -102,6 +79,809 @@ static void SetEReaderTrainerChecksum(struct BattleTowerEReaderTrainer *ereaderT static u8 SetTentPtrsGetLevel(void); // Const rom data. + + + + + + + + + + +extern const u8 sRubyFacilityClassToEmerald[82][2]; +/* +const u8 sRubyFacilityClassToEmerald[82][2] = +{ + {0x00, 0x0b}, + {0x01, 0x01}, + {0x02, 0x06}, + {0x03, 0x0d}, + {0x04, 0x0e}, + {0x05, 0x0f}, + {0x06, 0x10}, + {0x07, 0x11}, + {0x08, 0x03}, + {0x09, 0x12}, + {0x0a, 0x0c}, + {0x0b, 0x13}, + {0x0c, 0x14}, + {0x0d, 0x15}, + {0x0e, 0x17}, + {0x0f, 0x07}, + {0x10, 0x0a}, + {0x11, 0x19}, + {0x12, 0x1a}, + {0x13, 0x1b}, + {0x14, 0x1d}, + {0x15, 0x1e}, + {0x16, 0x1f}, + {0x17, 0x20}, + {0x18, 0x21}, + {0x19, 0x22}, + {0x1a, 0x23}, + {0x1b, 0x24}, + {0x1c, 0x25}, + {0x1d, 0x26}, + {0x1e, 0x27}, + {0x1f, 0x28}, + {0x20, 0x29}, + {0x21, 0x2a}, + {0x22, 0x09}, + {0x23, 0x16}, + {0x24, 0x2b}, + {0x25, 0x2c}, + {0x26, 0x2d}, + {0x27, 0x2e}, + {0x28, 0x2f}, + {0x29, 0x30}, + {0x2a, 0x31}, + {0x2b, 0x32}, + {0x2c, 0x33}, + {0x2d, 0x34}, + {0x2e, 0x04}, + {0x2f, 0x35}, + {0x30, 0x36}, + {0x31, 0x37}, + {0x32, 0x38}, + {0x33, 0x1c}, + {0x34, 0x39}, + {0x35, 0x3a}, + {0x38, 0x05}, + {0x39, 0x3b}, + {0x3a, 0x3c}, + {0x3b, 0x3d}, + {0x3c, 0x3e}, + {0x3d, 0x3f}, + {0x3e, 0x40}, + {0x3f, 0x41}, + {0x40, 0x42}, + {0x41, 0x02}, + {0x42, 0x44}, + {0x43, 0x45}, + {0x44, 0x46}, + {0x45, 0x08}, + {0x46, 0x18}, + {0x47, 0x47}, + {0x48, 0x43}, + {0x49, 0x00}, + {0x4a, 0x48}, + {0x4b, 0x49}, + {0x4c, 0x4a}, + {0x00, 0x00} +}; +*/ + +const u8 *const gUnknown_085DCFD8[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_244383, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244413, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24444B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6 +}; + +const u8 *const gUnknown_085DCFEC[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244549, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24459B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5 +}; + +const u8 *const gUnknown_085DD000[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244618, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244643, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24468F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4 +}; + +const u8 *const gUnknown_085DD014[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24479E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24480C, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7 +}; + +const u8 *const gUnknown_085DD028[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244939, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244989, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6 +}; + +const u8 *const gUnknown_085DD03C[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244AD6, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244B52, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93 +}; + +const u8 *const gUnknown_085DD050[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244C6E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244CD6, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07 +}; + +const u8 *const gUnknown_085DD064[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244DC6, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244DFE, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B +}; + +const u8 *const gUnknown_085DD078[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244EF4, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244F4F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98 +}; + +const u8 *const gUnknown_085DD08C[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245013, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24503D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245087, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0 +}; + +const u8 *const gUnknown_085DD0A0[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245196, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2451BD, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24522F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A +}; + +const u8 *const gUnknown_085DD0B4[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245406, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245464, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3 +}; + +const u8 *const gUnknown_085DD0C8[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245535, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24555F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2455EC, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245656 +}; + +const u8 *const gUnknown_085DD0DC[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245740, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2457D9, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F +}; + +const u8 *const gUnknown_085DD0F0[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_245851, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2458CE, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245923, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F +}; + +const u8 *const gUnknown_085DD104[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245A5F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245AB4, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E +}; + +const u8 *const gUnknown_085DD118[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245BBD, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245C05, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D +}; + +const u8 *const gUnknown_085DD12C[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245CAC, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245CE6, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07 +}; + +const u8 *const gUnknown_085DD140[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245D8D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245DC7, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0 +}; + +const u8 *const gUnknown_085DD154[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245E78, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245EBD, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC +}; + +const u8 *const gUnknown_085DD168[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245F87, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245FC6, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246002 +}; + +const u8 *const gUnknown_085DD17C[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_246020, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246051, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246082, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2460D5, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D +}; + +const u8 *const gUnknown_085DD190[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24617D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2461C7, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5 +}; + +const u8 *const gUnknown_085DD1A4[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246244, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24626E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2462AA, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4 +}; + +const u8 *const gUnknown_085DD1B8[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24636B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2463C5, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF +}; + +const u8 *const gUnknown_085DD1CC[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_246449, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246478, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2464EE, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246529 +}; + +const u8 *const gUnknown_085DD1E0[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_246571, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24658C, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2465B5, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246605, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A +}; + +const u8 *const gUnknown_085DD1F4[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_246662, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246686, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2466B4, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2466E6, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A +}; + +const u8 *const gUnknown_085DD208[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_246741, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246760, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246791, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2467C4, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6 +}; + +const u8 *const gUnknown_085DD21C[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246831, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246864, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2468A7, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE +}; + +const u8 *const gUnknown_085DD230[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24697C, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2469B4, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1 +}; + +const u8 *const gUnknown_085DD244[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246A85, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7 +}; + +const u8 *const gUnknown_085DD258[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246B6B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246BB2, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9 +}; + +const u8 *const gUnknown_085DD26C[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246C6C, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246CB3, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9 +}; + +const u8 *const gUnknown_085DD280[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246D6A, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246D9E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3 +}; + +const u8 *const gUnknown_085DD294[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246E64, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246EB6, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE +}; + +const u8 *const gUnknown_085DD2A8[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246F4C, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246F7B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246FCC, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247013 +}; + +const u8 *const gUnknown_085DD2BC[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2470B2, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2470FD, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A +}; + +const u8 *const gUnknown_085DD2D0[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2471C7, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2471FB, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247238 +}; + +const u8 *const gUnknown_085DD2E4[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_247268, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247291, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2472C7, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247313, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247348 +}; + +const u8 *const gUnknown_085DD2F8[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2473C6, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2473FB, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247438 +}; + +const u8 *const gUnknown_085DD30C[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_247470, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247484, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2474AF, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2474EC, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D +}; + +const u8 *const gUnknown_085DD320[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24758B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2475BC, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5 +}; + +const u8 *const gUnknown_085DD334[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247629, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247655, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24769B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED +}; + +const u8 *const gUnknown_085DD348[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_247724, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247749, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24777A, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2477CE, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247807 +}; + +const u8 *const gUnknown_085DD35C[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_247838, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247854, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247889, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2478DD, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D +}; + +const u8 *const gUnknown_085DD370[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_247942, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247991, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2479CE, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18 +}; + +const u8 *const gUnknown_085DD384[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247AA1, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247AE3, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16 +}; + +const u8 *const gUnknown_085DD398[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247B9B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247BE7, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23 +}; + +const u8 *const gUnknown_085DD3AC[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247CB2, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247D07, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E +}; + +const u8 *const gUnknown_085DD3C0[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247DFE, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247E3E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E +}; + +const u8 *const gUnknown_085DD3D4[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247EE9, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247F3F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D +}; + +const u8 *const gUnknown_085DD3E8[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247FE9, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248031, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E +}; + +const u8 *const gUnknown_085DD3FC[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2480DC, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248128, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248151 +}; + +const u8 *const gUnknown_085DD410[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2481E1, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248221, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F +}; + +const u8 *const gUnknown_085DD424[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_248297, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2482DC, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248321, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D +}; + +const u8 *const gUnknown_085DD438[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_248369, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2483C1, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248401, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248431 +}; + +const u8 *const gUnknown_085DD44C[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_248467, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248477, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2484AC, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2484E7, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248517 +}; + +const u8 *const gUnknown_085DD460[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_248553, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24857D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2485E5, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248614 +}; + +const u8 *const gUnknown_085DD474[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248661, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248671, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2486C6, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF +}; + +const u8 *const gUnknown_085DD488[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_248725, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248751, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248781, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2487C9, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7 +}; + +const u8 *const gUnknown_085DD49C[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_248829, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248892, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2488D8, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248908 +}; + +const u8 *const gUnknown_085DD4B0[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24896F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2489BD, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7 +}; + +const u8 *const gUnknown_085DD4C4[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248A72, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248AC0, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB +}; + +const u8 *const gUnknown_085DD4D8[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248B4C, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248BB4, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE +}; + +const u8 *const gUnknown_085DD4EC[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248C90, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248CCF, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248D04 +}; + +struct +{ + u32 facilityClass; + const u8 *const *strings; +} const gUnknown_085DD500[50] = +{ + {0x00000047, gUnknown_085DD118}, + {0x0000002b, gUnknown_085DD12C}, + {0x00000000, gUnknown_085DD140}, + {0x00000014, gUnknown_085DD154}, + {0x0000002d, gUnknown_085DD168}, + {0x00000013, gUnknown_085DD17C}, + {0x0000002f, gUnknown_085DD190}, + {0x00000043, gUnknown_085DD1A4}, + {0x00000026, gUnknown_085DD1B8}, + {0x00000015, gUnknown_085DD1CC}, + {0x0000000a, gUnknown_085DD1E0}, + {0x00000010, gUnknown_085DD1F4}, + {0x0000000c, gUnknown_085DD208}, + {0x00000042, gUnknown_085DD21C}, + {0x00000031, gUnknown_085DD230}, + {0x00000030, gUnknown_085DD244}, + {0x00000036, gUnknown_085DD258}, + {0x0000002e, gUnknown_085DD26C}, + {0x00000011, gUnknown_085DD280}, + {0x00000019, gUnknown_085DD294}, + {0x00000020, gUnknown_085DD2A8}, + {0x00000029, gUnknown_085DD2BC}, + {0x00000009, gUnknown_085DD2D0}, + {0x00000016, gUnknown_085DD2E4}, + {0x00000034, gUnknown_085DD2F8}, + {0x00000004, gUnknown_085DD30C}, + {0x00000035, gUnknown_085DD320}, + {0x00000037, gUnknown_085DD334}, + {0x0000001d, gUnknown_085DD348}, + {0x0000003a, gUnknown_085DD35C}, + {0x00000005, gUnknown_085DD370}, + {0x00000044, gUnknown_085DD384}, + {0x00000045, gUnknown_085DD398}, + {0x0000000d, gUnknown_085DD3AC}, + {0x0000000e, gUnknown_085DD3C0}, + {0x00000003, gUnknown_085DD3D4}, + {0x00000012, gUnknown_085DD3E8}, + {0x00000017, gUnknown_085DD3FC}, + {0x0000001a, gUnknown_085DD410}, + {0x0000001b, gUnknown_085DD424}, + {0x0000001c, gUnknown_085DD438}, + {0x0000001e, gUnknown_085DD44C}, + {0x0000001f, gUnknown_085DD460}, + {0x00000027, gUnknown_085DD474}, + {0x00000002, gUnknown_085DD488}, + {0x0000002a, gUnknown_085DD49C}, + {0x00000038, gUnknown_085DD4B0}, + {0x00000032, gUnknown_085DD4C4}, + {0x00000033, gUnknown_085DD4D8}, + {0x00000007, gUnknown_085DD4EC} +}; + +const u8 *const *const gUnknown_085DD690[] = +{ + gUnknown_085DCFD8, + gUnknown_085DCFEC, + gUnknown_085DD000, + gUnknown_085DD014, + gUnknown_085DD028, + gUnknown_085DD03C, + gUnknown_085DD050, + gUnknown_085DD064, + gUnknown_085DD078, + gUnknown_085DD08C, + gUnknown_085DD0A0, + gUnknown_085DD0B4, + gUnknown_085DD0C8, + gUnknown_085DD0DC, + gUnknown_085DD0F0, + gUnknown_085DD104 +}; + +struct +{ + u16 species; + u8 fixedIV; + u8 level; + u8 nature; + u8 evs[6]; + u16 moves[4]; +} const sStevenMons[3] = +{ + { + .species = SPECIES_METANG, + .fixedIV = 31, + .level = 42, + .nature = NATURE_BRAVE, + .evs = {0, 252, 252, 0, 6, 0}, + .moves = {MOVE_LIGHT_SCREEN, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_METAL_CLAW} + }, + { + .species = SPECIES_SKARMORY, + .fixedIV = 31, + .level = 43, + .nature = NATURE_IMPISH, + .evs = {252, 0, 0, 0, 6, 252}, + .moves = {MOVE_TOXIC, MOVE_AERIAL_ACE, MOVE_PROTECT, MOVE_STEEL_WING} + }, + { + .species = SPECIES_AGGRON, + .fixedIV = 31, + .level = 44, + .nature = NATURE_ADAMANT, + .evs = {0, 252, 0, 0, 252, 6}, + .moves = {MOVE_THUNDER, MOVE_PROTECT, MOVE_SOLAR_BEAM, MOVE_DRAGON_CLAW} + } +}; + +#include "data/battle_frontier/battle_tent.h" + static void (* const gUnknown_085DF96C[])(void) = { sub_8161F94, -- cgit v1.2.3 From 80c3258504b2736f9db113a90462c0e09b0b1078 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 4 Dec 2018 12:09:35 -0500 Subject: finish battle tower data except sRubyFacilityClassToEmerald --- src/battle_tower.c | 198 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 186 insertions(+), 12 deletions(-) (limited to 'src/battle_tower.c') diff --git a/src/battle_tower.c b/src/battle_tower.c index d95cadfc2..f00db4c1d 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -31,10 +31,7 @@ extern void sub_81A4C30(void); -extern const u16 gBattleFrontierHeldItems[]; extern const u16 gUnknown_085DFA46[]; -extern const struct FacilityMon gBattleFrontierMons[]; -extern const struct BattleFrontierTrainer gBattleFrontierTrainers[]; extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224157[]; extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224166[]; @@ -79,15 +76,192 @@ static void SetEReaderTrainerChecksum(struct BattleTowerEReaderTrainer *ereaderT static u8 SetTentPtrsGetLevel(void); // Const rom data. - - - - - - - - - +const u16 gBattleFrontierHeldItems[] = +{ + ITEM_NONE, + ITEM_KINGS_ROCK, + ITEM_SITRUS_BERRY, + ITEM_ORAN_BERRY, + ITEM_CHESTO_BERRY, + ITEM_HARD_STONE, + ITEM_FOCUS_BAND, + ITEM_PERSIM_BERRY, + ITEM_MIRACLE_SEED, + ITEM_BERRY_JUICE, + ITEM_MACHO_BRACE, + ITEM_SILVER_POWDER, + ITEM_CHERI_BERRY, + ITEM_BLACK_GLASSES, + ITEM_BLACK_BELT, + ITEM_SOUL_DEW, + ITEM_CHOICE_BAND, + ITEM_MAGNET, + ITEM_SILK_SCARF, + ITEM_WHITE_HERB, + ITEM_DEEP_SEA_SCALE, + ITEM_DEEP_SEA_TOOTH, + ITEM_MYSTIC_WATER, + ITEM_SHARP_BEAK, + ITEM_QUICK_CLAW, + ITEM_LEFTOVERS, + ITEM_RAWST_BERRY, + ITEM_LIGHT_BALL, + ITEM_POISON_BARB, + ITEM_NEVER_MELT_ICE, + ITEM_ASPEAR_BERRY, + ITEM_SPELL_TAG, + ITEM_BRIGHT_POWDER, + ITEM_LEPPA_BERRY, + ITEM_SCOPE_LENS, + ITEM_TWISTED_SPOON, + ITEM_METAL_COAT, + ITEM_MENTAL_HERB, + ITEM_CHARCOAL, + ITEM_PECHA_BERRY, + ITEM_SOFT_SAND, + ITEM_LUM_BERRY, + ITEM_DRAGON_SCALE, + ITEM_DRAGON_FANG, + ITEM_IAPAPA_BERRY, + ITEM_WIKI_BERRY, + ITEM_SEA_INCENSE, + ITEM_SHELL_BELL, + ITEM_SALAC_BERRY, + ITEM_LANSAT_BERRY, + ITEM_APICOT_BERRY, + ITEM_STARF_BERRY, + ITEM_LIECHI_BERRY, + ITEM_STICK, + ITEM_LAX_INCENSE, + ITEM_AGUAV_BERRY, + ITEM_FIGY_BERRY, + ITEM_THICK_CLUB, + ITEM_MAGO_BERRY, + ITEM_METAL_POWDER, + ITEM_PETAYA_BERRY, + ITEM_LUCKY_PUNCH, + ITEM_GANLON_BERRY +}; + +#include "data/battle_frontier/battle_frontier_trainer_mons.h" +#include "data/battle_frontier/battle_frontier_trainers.h" +#include "data/battle_frontier/battle_frontier_mons.h" + +const u8 gTowerMaleFacilityClasses[] = +{ + FACILITY_CLASS_RUIN_MANIAC, + FACILITY_CLASS_TUBER_M, + FACILITY_CLASS_COOLTRAINER_M, + FACILITY_CLASS_RICH_BOY, + FACILITY_CLASS_POKEMANIAC, + FACILITY_CLASS_SWIMMER_M, + FACILITY_CLASS_BLACK_BELT, + FACILITY_CLASS_GUITARIST, + FACILITY_CLASS_KINDLER, + FACILITY_CLASS_CAMPER, + FACILITY_CLASS_BUG_MANIAC, + FACILITY_CLASS_PSYCHIC_M, + FACILITY_CLASS_GENTLEMAN, + FACILITY_CLASS_SCHOOL_KID_M, + FACILITY_CLASS_POKEFAN_M, + FACILITY_CLASS_EXPERT_M, + FACILITY_CLASS_YOUNGSTER, + FACILITY_CLASS_FISHERMAN, + FACILITY_CLASS_CYCLING_TRIATHLETE_M, + FACILITY_CLASS_RUNNING_TRIATHLETE_M, + FACILITY_CLASS_SWIMMING_TRIATHLETE_M, + FACILITY_CLASS_DRAGON_TAMER, + FACILITY_CLASS_BIRD_KEEPER, + FACILITY_CLASS_NINJA_BOY, + FACILITY_CLASS_SAILOR, + FACILITY_CLASS_COLLECTOR, + FACILITY_CLASS_PKMN_BREEDER_M, + FACILITY_CLASS_PKMN_RANGER_M, + FACILITY_CLASS_BUG_CATCHER, + FACILITY_CLASS_HIKER +}; + +const u8 gTowerFemaleFacilityClasses[] = +{ + FACILITY_CLASS_AROMA_LADY, + FACILITY_CLASS_TUBER_F, + FACILITY_CLASS_COOLTRAINER_F, + FACILITY_CLASS_HEX_MANIAC, + FACILITY_CLASS_LADY, + FACILITY_CLASS_BEAUTY, + FACILITY_CLASS_PSYCHIC_F, + FACILITY_CLASS_SCHOOL_KID_F, + FACILITY_CLASS_POKEFAN_F, + FACILITY_CLASS_EXPERT_F, + FACILITY_CLASS_CYCLING_TRIATHLETE_F, + FACILITY_CLASS_RUNNING_TRIATHLETE_F, + FACILITY_CLASS_SWIMMING_TRIATHLETE_F, + FACILITY_CLASS_BATTLE_GIRL, + FACILITY_CLASS_PARASOL_LADY, + FACILITY_CLASS_SWIMMER_F, + FACILITY_CLASS_PICNICKER, + FACILITY_CLASS_POKEMON_BREEDER_F, + FACILITY_CLASS_PKMN_RANGER_F, + FACILITY_CLASS_LASS +}; + +const u8 gTowerMaleTrainerGfxIds[] = +{ + EVENT_OBJ_GFX_HIKER, + EVENT_OBJ_GFX_TUBER_M, + EVENT_OBJ_GFX_MAN_3, + EVENT_OBJ_GFX_RICH_BOY, + EVENT_OBJ_GFX_MANIAC, + EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, + EVENT_OBJ_GFX_BLACK_BELT, + EVENT_OBJ_GFX_MAN_5, + EVENT_OBJ_GFX_MAN_5, + EVENT_OBJ_GFX_CAMPER, + EVENT_OBJ_GFX_MANIAC, + EVENT_OBJ_GFX_PSYCHIC_M, + EVENT_OBJ_GFX_GENTLEMAN, + EVENT_OBJ_GFX_SCHOOL_KID_M, + EVENT_OBJ_GFX_POKEFAN_M, + EVENT_OBJ_GFX_EXPERT_M, + EVENT_OBJ_GFX_YOUNGSTER, + EVENT_OBJ_GFX_FISHERMAN, + EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, + EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, + EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, + EVENT_OBJ_GFX_MAN_3, + EVENT_OBJ_GFX_MAN_5, + EVENT_OBJ_GFX_NINJA_BOY, + EVENT_OBJ_GFX_SAILOR, + EVENT_OBJ_GFX_MANIAC, + EVENT_OBJ_GFX_MAN_4, + EVENT_OBJ_GFX_CAMPER, + EVENT_OBJ_GFX_BUG_CATCHER, + EVENT_OBJ_GFX_HIKER +}; + +const u8 gTowerFemaleTrainerGfxIds[] = +{ + EVENT_OBJ_GFX_WOMAN_2, + EVENT_OBJ_GFX_TUBER_F, + EVENT_OBJ_GFX_WOMAN_5, + EVENT_OBJ_GFX_HEX_MANIAC, + EVENT_OBJ_GFX_WOMAN_2, + EVENT_OBJ_GFX_BEAUTY, + EVENT_OBJ_GFX_LASS, + EVENT_OBJ_GFX_GIRL_3, + EVENT_OBJ_GFX_POKEFAN_F, + EVENT_OBJ_GFX_EXPERT_F, + EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, + EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, + EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, + EVENT_OBJ_GFX_GIRL_3, + EVENT_OBJ_GFX_WOMAN_5, + EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, + EVENT_OBJ_GFX_PICNICKER, + EVENT_OBJ_GFX_WOMAN_2, + EVENT_OBJ_GFX_PICNICKER, + EVENT_OBJ_GFX_LASS +}; extern const u8 sRubyFacilityClassToEmerald[82][2]; /* -- cgit v1.2.3 From d9287f32614fa93e9a962154cb1b9fd38039df58 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 4 Dec 2018 12:15:13 -0500 Subject: extern gTower trainer data --- src/battle_tower.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/battle_tower.c') diff --git a/src/battle_tower.c b/src/battle_tower.c index f00db4c1d..7bc354c1d 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[] = { -- cgit v1.2.3 From a9e6154fa949d90bcc629cd980b180abe57b7474 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 5 Dec 2018 22:21:26 +0100 Subject: Finish porting battle frontier data --- src/battle_tower.c | 163 +++++++++++++++++++++++++++-------------------------- 1 file changed, 82 insertions(+), 81 deletions(-) (limited to 'src/battle_tower.c') diff --git a/src/battle_tower.c b/src/battle_tower.c index 7bc354c1d..08009faab 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -10,6 +10,7 @@ #include "international_string_util.h" #include "battle.h" #include "frontier_util.h" +#include "strings.h" #include "recorded_battle.h" #include "easy_chat.h" #include "gym_leader_rematch.h" @@ -23,14 +24,13 @@ #include "tv.h" #include "battle_factory.h" #include "constants/battle_frontier.h" +#include "constants/items.h" #include "constants/trainers.h" #include "constants/event_objects.h" #include "constants/moves.h" #include "constants/species.h" #include "constants/easy_chat.h" -extern void sub_81A4C30(void); - extern const u16 gUnknown_085DFA46[]; extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224157[]; @@ -76,7 +76,7 @@ static void SetEReaderTrainerChecksum(struct BattleTowerEReaderTrainer *ereaderT static u8 SetTentPtrsGetLevel(void); // Const rom data. -const u16 gBattleFrontierHeldItems[] = +const u16 gBattleFrontierHeldItems[] = { ITEM_NONE, ITEM_KINGS_ROCK, @@ -147,7 +147,7 @@ const u16 gBattleFrontierHeldItems[] = #include "data/battle_frontier/battle_frontier_trainers.h" #include "data/battle_frontier/battle_frontier_mons.h" -const u8 gTowerMaleFacilityClasses[] = +const u8 gTowerMaleFacilityClasses[30] = { FACILITY_CLASS_RUIN_MANIAC, FACILITY_CLASS_TUBER_M, @@ -181,7 +181,7 @@ const u8 gTowerMaleFacilityClasses[] = FACILITY_CLASS_HIKER }; -const u8 gTowerFemaleFacilityClasses[] = +const u8 gTowerFemaleFacilityClasses[20] = { FACILITY_CLASS_AROMA_LADY, FACILITY_CLASS_TUBER_F, @@ -205,7 +205,7 @@ const u8 gTowerFemaleFacilityClasses[] = FACILITY_CLASS_LASS }; -const u8 gTowerMaleTrainerGfxIds[] = +const u8 gTowerMaleTrainerGfxIds[30] = { EVENT_OBJ_GFX_HIKER, EVENT_OBJ_GFX_TUBER_M, @@ -239,7 +239,7 @@ const u8 gTowerMaleTrainerGfxIds[] = EVENT_OBJ_GFX_HIKER }; -const u8 gTowerFemaleTrainerGfxIds[] = +const u8 gTowerFemaleTrainerGfxIds[20] = { EVENT_OBJ_GFX_WOMAN_2, EVENT_OBJ_GFX_TUBER_F, @@ -263,7 +263,7 @@ const u8 gTowerFemaleTrainerGfxIds[] = EVENT_OBJ_GFX_LASS }; -const u8 sRubyFacilityClassToEmerald[82][2] = +static const u8 sRubyFacilityClassToEmerald[][2] = { {0x00, 0x0b}, {0x01, 0x01}, @@ -340,10 +340,9 @@ const u8 sRubyFacilityClassToEmerald[82][2] = {0x4a, 0x48}, {0x4b, 0x49}, {0x4c, 0x4a}, - {0x00, 0x00} }; -const u8 *const gUnknown_085DCFD8[] = +static const u8 *const gUnknown_085DCFD8[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_244383, BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7, @@ -352,7 +351,7 @@ const u8 *const gUnknown_085DCFD8[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6 }; -const u8 *const gUnknown_085DCFEC[] = +static const u8 *const gUnknown_085DCFEC[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF, BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E, @@ -361,7 +360,7 @@ const u8 *const gUnknown_085DCFEC[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5 }; -const u8 *const gUnknown_085DD000[] = +static const u8 *const gUnknown_085DD000[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8, BattleFrontier_BattleTowerMultiBattleRoom_Text_244618, @@ -370,7 +369,7 @@ const u8 *const gUnknown_085DD000[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4 }; -const u8 *const gUnknown_085DD014[] = +static const u8 *const gUnknown_085DD014[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5, BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D, @@ -379,7 +378,7 @@ const u8 *const gUnknown_085DD014[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7 }; -const u8 *const gUnknown_085DD028[] = +static const u8 *const gUnknown_085DD028[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD, BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5, @@ -388,7 +387,7 @@ const u8 *const gUnknown_085DD028[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6 }; -const u8 *const gUnknown_085DD03C[] = +static const u8 *const gUnknown_085DD03C[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23, BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9, @@ -397,7 +396,7 @@ const u8 *const gUnknown_085DD03C[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93 }; -const u8 *const gUnknown_085DD050[] = +static const u8 *const gUnknown_085DD050[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2, BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18, @@ -406,7 +405,7 @@ const u8 *const gUnknown_085DD050[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07 }; -const u8 *const gUnknown_085DD064[] = +static const u8 *const gUnknown_085DD064[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36, BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82, @@ -415,7 +414,7 @@ const u8 *const gUnknown_085DD064[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B }; -const u8 *const gUnknown_085DD078[] = +static const u8 *const gUnknown_085DD078[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E, BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA, @@ -424,7 +423,7 @@ const u8 *const gUnknown_085DD078[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98 }; -const u8 *const gUnknown_085DD08C[] = +static const u8 *const gUnknown_085DD08C[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3, BattleFrontier_BattleTowerMultiBattleRoom_Text_245013, @@ -433,7 +432,7 @@ const u8 *const gUnknown_085DD08C[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0 }; -const u8 *const gUnknown_085DD0A0[] = +static const u8 *const gUnknown_085DD0A0[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6, BattleFrontier_BattleTowerMultiBattleRoom_Text_245196, @@ -442,7 +441,7 @@ const u8 *const gUnknown_085DD0A0[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A }; -const u8 *const gUnknown_085DD0B4[] = +static const u8 *const gUnknown_085DD0B4[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF, BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4, @@ -451,7 +450,7 @@ const u8 *const gUnknown_085DD0B4[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3 }; -const u8 *const gUnknown_085DD0C8[] = +static const u8 *const gUnknown_085DD0C8[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6, BattleFrontier_BattleTowerMultiBattleRoom_Text_245535, @@ -460,7 +459,7 @@ const u8 *const gUnknown_085DD0C8[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_245656 }; -const u8 *const gUnknown_085DD0DC[] = +static const u8 *const gUnknown_085DD0DC[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A, BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5, @@ -469,7 +468,7 @@ const u8 *const gUnknown_085DD0DC[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F }; -const u8 *const gUnknown_085DD0F0[] = +static const u8 *const gUnknown_085DD0F0[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_245851, BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C, @@ -478,7 +477,7 @@ const u8 *const gUnknown_085DD0F0[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F }; -const u8 *const gUnknown_085DD104[] = +static const u8 *const gUnknown_085DD104[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE, BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7, @@ -487,7 +486,7 @@ const u8 *const gUnknown_085DD104[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E }; -const u8 *const gUnknown_085DD118[] = +static const u8 *const gUnknown_085DD118[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79, BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91, @@ -496,7 +495,7 @@ const u8 *const gUnknown_085DD118[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D }; -const u8 *const gUnknown_085DD12C[] = +static const u8 *const gUnknown_085DD12C[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66, BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F, @@ -505,7 +504,7 @@ const u8 *const gUnknown_085DD12C[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07 }; -const u8 *const gUnknown_085DD140[] = +static const u8 *const gUnknown_085DD140[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B, BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60, @@ -514,7 +513,7 @@ const u8 *const gUnknown_085DD140[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0 }; -const u8 *const gUnknown_085DD154[] = +static const u8 *const gUnknown_085DD154[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20, BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41, @@ -523,7 +522,7 @@ const u8 *const gUnknown_085DD154[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC }; -const u8 *const gUnknown_085DD168[] = +static const u8 *const gUnknown_085DD168[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B, BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58, @@ -532,7 +531,7 @@ const u8 *const gUnknown_085DD168[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_246002 }; -const u8 *const gUnknown_085DD17C[] = +static const u8 *const gUnknown_085DD17C[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_246020, BattleFrontier_BattleTowerMultiBattleRoom_Text_246051, @@ -541,7 +540,7 @@ const u8 *const gUnknown_085DD17C[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D }; -const u8 *const gUnknown_085DD190[] = +static const u8 *const gUnknown_085DD190[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A, BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D, @@ -550,7 +549,7 @@ const u8 *const gUnknown_085DD190[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5 }; -const u8 *const gUnknown_085DD1A4[] = +static const u8 *const gUnknown_085DD1A4[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A, BattleFrontier_BattleTowerMultiBattleRoom_Text_246244, @@ -559,7 +558,7 @@ const u8 *const gUnknown_085DD1A4[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4 }; -const u8 *const gUnknown_085DD1B8[] = +static const u8 *const gUnknown_085DD1B8[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F, BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C, @@ -568,7 +567,7 @@ const u8 *const gUnknown_085DD1B8[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF }; -const u8 *const gUnknown_085DD1CC[] = +static const u8 *const gUnknown_085DD1CC[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_246449, BattleFrontier_BattleTowerMultiBattleRoom_Text_246478, @@ -577,7 +576,7 @@ const u8 *const gUnknown_085DD1CC[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_246529 }; -const u8 *const gUnknown_085DD1E0[] = +static const u8 *const gUnknown_085DD1E0[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_246571, BattleFrontier_BattleTowerMultiBattleRoom_Text_24658C, @@ -586,7 +585,7 @@ const u8 *const gUnknown_085DD1E0[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A }; -const u8 *const gUnknown_085DD1F4[] = +static const u8 *const gUnknown_085DD1F4[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_246662, BattleFrontier_BattleTowerMultiBattleRoom_Text_246686, @@ -595,7 +594,7 @@ const u8 *const gUnknown_085DD1F4[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A }; -const u8 *const gUnknown_085DD208[] = +static const u8 *const gUnknown_085DD208[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_246741, BattleFrontier_BattleTowerMultiBattleRoom_Text_246760, @@ -604,7 +603,7 @@ const u8 *const gUnknown_085DD208[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6 }; -const u8 *const gUnknown_085DD21C[] = +static const u8 *const gUnknown_085DD21C[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF, BattleFrontier_BattleTowerMultiBattleRoom_Text_246831, @@ -613,7 +612,7 @@ const u8 *const gUnknown_085DD21C[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE }; -const u8 *const gUnknown_085DD230[] = +static const u8 *const gUnknown_085DD230[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B, BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B, @@ -622,7 +621,7 @@ const u8 *const gUnknown_085DD230[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1 }; -const u8 *const gUnknown_085DD244[] = +static const u8 *const gUnknown_085DD244[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22, BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E, @@ -631,7 +630,7 @@ const u8 *const gUnknown_085DD244[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7 }; -const u8 *const gUnknown_085DD258[] = +static const u8 *const gUnknown_085DD258[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B, BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F, @@ -640,7 +639,7 @@ const u8 *const gUnknown_085DD258[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9 }; -const u8 *const gUnknown_085DD26C[] = +static const u8 *const gUnknown_085DD26C[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22, BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35, @@ -649,7 +648,7 @@ const u8 *const gUnknown_085DD26C[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9 }; -const u8 *const gUnknown_085DD280[] = +static const u8 *const gUnknown_085DD280[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D, BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F, @@ -658,7 +657,7 @@ const u8 *const gUnknown_085DD280[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3 }; -const u8 *const gUnknown_085DD294[] = +static const u8 *const gUnknown_085DD294[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A, BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39, @@ -667,7 +666,7 @@ const u8 *const gUnknown_085DD294[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE }; -const u8 *const gUnknown_085DD2A8[] = +static const u8 *const gUnknown_085DD2A8[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21, BattleFrontier_BattleTowerMultiBattleRoom_Text_246F4C, @@ -676,7 +675,7 @@ const u8 *const gUnknown_085DD2A8[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_247013 }; -const u8 *const gUnknown_085DD2BC[] = +static const u8 *const gUnknown_085DD2BC[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B, BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D, @@ -685,7 +684,7 @@ const u8 *const gUnknown_085DD2BC[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A }; -const u8 *const gUnknown_085DD2D0[] = +static const u8 *const gUnknown_085DD2D0[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C, BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D, @@ -694,7 +693,7 @@ const u8 *const gUnknown_085DD2D0[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_247238 }; -const u8 *const gUnknown_085DD2E4[] = +static const u8 *const gUnknown_085DD2E4[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_247268, BattleFrontier_BattleTowerMultiBattleRoom_Text_247291, @@ -703,7 +702,7 @@ const u8 *const gUnknown_085DD2E4[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_247348 }; -const u8 *const gUnknown_085DD2F8[] = +static const u8 *const gUnknown_085DD2F8[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A, BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F, @@ -712,7 +711,7 @@ const u8 *const gUnknown_085DD2F8[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_247438 }; -const u8 *const gUnknown_085DD30C[] = +static const u8 *const gUnknown_085DD30C[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_247470, BattleFrontier_BattleTowerMultiBattleRoom_Text_247484, @@ -721,7 +720,7 @@ const u8 *const gUnknown_085DD30C[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D }; -const u8 *const gUnknown_085DD320[] = +static const u8 *const gUnknown_085DD320[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A, BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C, @@ -730,7 +729,7 @@ const u8 *const gUnknown_085DD320[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5 }; -const u8 *const gUnknown_085DD334[] = +static const u8 *const gUnknown_085DD334[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D, BattleFrontier_BattleTowerMultiBattleRoom_Text_247629, @@ -739,7 +738,7 @@ const u8 *const gUnknown_085DD334[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED }; -const u8 *const gUnknown_085DD348[] = +static const u8 *const gUnknown_085DD348[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_247724, BattleFrontier_BattleTowerMultiBattleRoom_Text_247749, @@ -748,7 +747,7 @@ const u8 *const gUnknown_085DD348[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_247807 }; -const u8 *const gUnknown_085DD35C[] = +static const u8 *const gUnknown_085DD35C[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_247838, BattleFrontier_BattleTowerMultiBattleRoom_Text_247854, @@ -757,7 +756,7 @@ const u8 *const gUnknown_085DD35C[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D }; -const u8 *const gUnknown_085DD370[] = +static const u8 *const gUnknown_085DD370[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_247942, BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F, @@ -766,7 +765,7 @@ const u8 *const gUnknown_085DD370[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18 }; -const u8 *const gUnknown_085DD384[] = +static const u8 *const gUnknown_085DD384[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51, BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76, @@ -775,7 +774,7 @@ const u8 *const gUnknown_085DD384[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16 }; -const u8 *const gUnknown_085DD398[] = +static const u8 *const gUnknown_085DD398[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E, BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62, @@ -784,7 +783,7 @@ const u8 *const gUnknown_085DD398[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23 }; -const u8 *const gUnknown_085DD3AC[] = +static const u8 *const gUnknown_085DD3AC[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E, BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C, @@ -793,7 +792,7 @@ const u8 *const gUnknown_085DD3AC[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E }; -const u8 *const gUnknown_085DD3C0[] = +static const u8 *const gUnknown_085DD3C0[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97, BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7, @@ -802,7 +801,7 @@ const u8 *const gUnknown_085DD3C0[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E }; -const u8 *const gUnknown_085DD3D4[] = +static const u8 *const gUnknown_085DD3D4[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1, BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5, @@ -811,7 +810,7 @@ const u8 *const gUnknown_085DD3D4[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D }; -const u8 *const gUnknown_085DD3E8[] = +static const u8 *const gUnknown_085DD3E8[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3, BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7, @@ -820,7 +819,7 @@ const u8 *const gUnknown_085DD3E8[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E }; -const u8 *const gUnknown_085DD3FC[] = +static const u8 *const gUnknown_085DD3FC[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D, BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB, @@ -829,7 +828,7 @@ const u8 *const gUnknown_085DD3FC[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_248151 }; -const u8 *const gUnknown_085DD410[] = +static const u8 *const gUnknown_085DD410[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E, BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9, @@ -838,7 +837,7 @@ const u8 *const gUnknown_085DD410[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F }; -const u8 *const gUnknown_085DD424[] = +static const u8 *const gUnknown_085DD424[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_248297, BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1, @@ -847,7 +846,7 @@ const u8 *const gUnknown_085DD424[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D }; -const u8 *const gUnknown_085DD438[] = +static const u8 *const gUnknown_085DD438[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_248369, BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D, @@ -856,7 +855,7 @@ const u8 *const gUnknown_085DD438[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_248431 }; -const u8 *const gUnknown_085DD44C[] = +static const u8 *const gUnknown_085DD44C[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_248467, BattleFrontier_BattleTowerMultiBattleRoom_Text_248477, @@ -865,7 +864,7 @@ const u8 *const gUnknown_085DD44C[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_248517 }; -const u8 *const gUnknown_085DD460[] = +static const u8 *const gUnknown_085DD460[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_248553, BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A, @@ -874,7 +873,7 @@ const u8 *const gUnknown_085DD460[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_248614 }; -const u8 *const gUnknown_085DD474[] = +static const u8 *const gUnknown_085DD474[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E, BattleFrontier_BattleTowerMultiBattleRoom_Text_248661, @@ -883,7 +882,7 @@ const u8 *const gUnknown_085DD474[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF }; -const u8 *const gUnknown_085DD488[] = +static const u8 *const gUnknown_085DD488[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_248725, BattleFrontier_BattleTowerMultiBattleRoom_Text_248751, @@ -892,7 +891,7 @@ const u8 *const gUnknown_085DD488[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7 }; -const u8 *const gUnknown_085DD49C[] = +static const u8 *const gUnknown_085DD49C[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_248829, BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B, @@ -901,7 +900,7 @@ const u8 *const gUnknown_085DD49C[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_248908 }; -const u8 *const gUnknown_085DD4B0[] = +static const u8 *const gUnknown_085DD4B0[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B, BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F, @@ -910,7 +909,7 @@ const u8 *const gUnknown_085DD4B0[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7 }; -const u8 *const gUnknown_085DD4C4[] = +static const u8 *const gUnknown_085DD4C4[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10, BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40, @@ -919,7 +918,7 @@ const u8 *const gUnknown_085DD4C4[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB }; -const u8 *const gUnknown_085DD4D8[] = +static const u8 *const gUnknown_085DD4D8[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22, BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39, @@ -928,7 +927,7 @@ const u8 *const gUnknown_085DD4D8[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE }; -const u8 *const gUnknown_085DD4EC[] = +static const u8 *const gUnknown_085DD4EC[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E, BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B, @@ -941,7 +940,7 @@ struct { u32 facilityClass; const u8 *const *strings; -} const gUnknown_085DD500[50] = +} const gUnknown_085DD500[] = { {0x00000047, gUnknown_085DD118}, {0x0000002b, gUnknown_085DD12C}, @@ -995,7 +994,7 @@ struct {0x00000007, gUnknown_085DD4EC} }; -const u8 *const *const gUnknown_085DD690[] = +static const u8 *const *const gUnknown_085DD690[] = { gUnknown_085DCFD8, gUnknown_085DCFEC, @@ -3298,12 +3297,13 @@ bool32 RubyBattleTowerRecordToEmerald(struct RSBattleTowerRecord *src, struct Em { dst->lvlMode = src->lvlMode; dst->winStreak = src->winStreak; - for (i = 0; i < (signed) ARRAY_COUNT(sRubyFacilityClassToEmerald); i++) + // BUG: Reading outside the array. sRubyFacilityClassToEmerald has less than FACILITY_CLASSES_COUNT entries. + for (i = 0; i < FACILITY_CLASSES_COUNT; i++) { if (sRubyFacilityClassToEmerald[i][0] == src->facilityClass) break; } - if (i != ARRAY_COUNT(sRubyFacilityClassToEmerald)) + if (i != FACILITY_CLASSES_COUNT) dst->facilityClass = sRubyFacilityClassToEmerald[i][1]; else dst->facilityClass = FACILITY_CLASS_YOUNGSTER; @@ -3346,12 +3346,13 @@ bool32 EmeraldBattleTowerRecordToRuby(struct EmeraldBattleTowerRecord *src, stru { dst->lvlMode = src->lvlMode; dst->winStreak = src->winStreak; - for (i = 0; i < (signed) ARRAY_COUNT(sRubyFacilityClassToEmerald); i++) + // BUG: Reading outside the array. sRubyFacilityClassToEmerald has less than FACILITY_CLASSES_COUNT entries. + for (i = 0; i < FACILITY_CLASSES_COUNT; i++) { if (sRubyFacilityClassToEmerald[i][1] == src->facilityClass) break; } - if (i != ARRAY_COUNT(sRubyFacilityClassToEmerald)) + if (i != FACILITY_CLASSES_COUNT) dst->facilityClass = sRubyFacilityClassToEmerald[i][0]; else dst->facilityClass = 0x24; // FACILITY_CLASS_YOUNGSTER in Ruby/Sapphire. -- cgit v1.2.3 From 62384e7a6129acc3ffff866840ba663a308756c1 Mon Sep 17 00:00:00 2001 From: garak Date: Sun, 9 Dec 2018 22:57:46 -0500 Subject: use facility class constants --- src/battle_tower.c | 250 ++++++++++++++++++++++++++--------------------------- 1 file changed, 125 insertions(+), 125 deletions(-) (limited to 'src/battle_tower.c') diff --git a/src/battle_tower.c b/src/battle_tower.c index 08009faab..cb128b532 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -265,81 +265,81 @@ const u8 gTowerFemaleTrainerGfxIds[20] = static const u8 sRubyFacilityClassToEmerald[][2] = { - {0x00, 0x0b}, - {0x01, 0x01}, - {0x02, 0x06}, - {0x03, 0x0d}, - {0x04, 0x0e}, - {0x05, 0x0f}, - {0x06, 0x10}, - {0x07, 0x11}, - {0x08, 0x03}, - {0x09, 0x12}, - {0x0a, 0x0c}, - {0x0b, 0x13}, - {0x0c, 0x14}, - {0x0d, 0x15}, - {0x0e, 0x17}, - {0x0f, 0x07}, - {0x10, 0x0a}, - {0x11, 0x19}, - {0x12, 0x1a}, - {0x13, 0x1b}, - {0x14, 0x1d}, - {0x15, 0x1e}, - {0x16, 0x1f}, - {0x17, 0x20}, - {0x18, 0x21}, - {0x19, 0x22}, - {0x1a, 0x23}, - {0x1b, 0x24}, - {0x1c, 0x25}, - {0x1d, 0x26}, - {0x1e, 0x27}, - {0x1f, 0x28}, - {0x20, 0x29}, - {0x21, 0x2a}, - {0x22, 0x09}, - {0x23, 0x16}, - {0x24, 0x2b}, - {0x25, 0x2c}, - {0x26, 0x2d}, - {0x27, 0x2e}, - {0x28, 0x2f}, - {0x29, 0x30}, - {0x2a, 0x31}, - {0x2b, 0x32}, - {0x2c, 0x33}, - {0x2d, 0x34}, - {0x2e, 0x04}, - {0x2f, 0x35}, - {0x30, 0x36}, - {0x31, 0x37}, - {0x32, 0x38}, - {0x33, 0x1c}, - {0x34, 0x39}, - {0x35, 0x3a}, - {0x38, 0x05}, - {0x39, 0x3b}, - {0x3a, 0x3c}, - {0x3b, 0x3d}, - {0x3c, 0x3e}, - {0x3d, 0x3f}, - {0x3e, 0x40}, - {0x3f, 0x41}, - {0x40, 0x42}, - {0x41, 0x02}, - {0x42, 0x44}, - {0x43, 0x45}, - {0x44, 0x46}, - {0x45, 0x08}, - {0x46, 0x18}, - {0x47, 0x47}, - {0x48, 0x43}, - {0x49, 0x00}, - {0x4a, 0x48}, - {0x4b, 0x49}, - {0x4c, 0x4a}, + {0x00, FACILITY_CLASS_AQUA_LEADER_ARCHIE}, + {0x01, FACILITY_CLASS_AQUA_GRUNT_M}, + {0x02, FACILITY_CLASS_AQUA_GRUNT_F}, + {0x03, FACILITY_CLASS_AROMA_LADY}, + {0x04, FACILITY_CLASS_RUIN_MANIAC}, + {0x05, FACILITY_CLASS_INTERVIEWER}, + {0x06, FACILITY_CLASS_TUBER_F}, + {0x07, FACILITY_CLASS_TUBER_M}, + {0x08, FACILITY_CLASS_COOLTRAINER_M}, + {0x09, FACILITY_CLASS_COOLTRAINER_F}, + {0x0a, FACILITY_CLASS_HEX_MANIAC}, + {0x0b, FACILITY_CLASS_LADY}, + {0x0c, FACILITY_CLASS_BEAUTY}, + {0x0d, FACILITY_CLASS_RICH_BOY}, + {0x0e, FACILITY_CLASS_POKEMANIAC}, + {0x0f, FACILITY_CLASS_SWIMMER_M}, + {0x10, FACILITY_CLASS_BLACK_BELT}, + {0x11, FACILITY_CLASS_GUITARIST}, + {0x12, FACILITY_CLASS_KINDLER}, + {0x13, FACILITY_CLASS_CAMPER}, + {0x14, FACILITY_CLASS_BUG_MANIAC}, + {0x15, FACILITY_CLASS_PSYCHIC_M}, + {0x16, FACILITY_CLASS_PSYCHIC_F}, + {0x17, FACILITY_CLASS_GENTLEMAN}, + {0x18, FACILITY_CLASS_ELITE_FOUR_SIDNEY}, + {0x19, FACILITY_CLASS_ELITE_FOUR_PHOEBE}, + {0x1a, FACILITY_CLASS_LEADER_ROXANNE}, + {0x1b, FACILITY_CLASS_LEADER_BRAWLY}, + {0x1c, FACILITY_CLASS_LEADER_TATE_AND_LIZA}, + {0x1d, FACILITY_CLASS_SCHOOL_KID_M}, + {0x1e, FACILITY_CLASS_SCHOOL_KID_F}, + {0x1f, FACILITY_CLASS_SR_AND_JR}, + {0x20, FACILITY_CLASS_POKEFAN_M}, + {0x21, FACILITY_CLASS_POKEFAN_F}, + {0x22, FACILITY_CLASS_EXPERT_M}, + {0x23, FACILITY_CLASS_EXPERT_F}, + {0x24, FACILITY_CLASS_YOUNGSTER}, + {0x25, FACILITY_CLASS_CHAMPION_WALLACE}, + {0x26, FACILITY_CLASS_FISHERMAN}, + {0x27, FACILITY_CLASS_CYCLING_TRIATHLETE_M}, + {0x28, FACILITY_CLASS_CYCLING_TRIATHLETE_F}, + {0x29, FACILITY_CLASS_RUNNING_TRIATHLETE_M}, + {0x2a, FACILITY_CLASS_RUNNING_TRIATHLETE_F}, + {0x2b, FACILITY_CLASS_SWIMMING_TRIATHLETE_M}, + {0x2c, FACILITY_CLASS_SWIMMING_TRIATHLETE_F}, + {0x2d, FACILITY_CLASS_DRAGON_TAMER}, + {0x2e, FACILITY_CLASS_BIRD_KEEPER}, + {0x2f, FACILITY_CLASS_NINJA_BOY}, + {0x30, FACILITY_CLASS_BATTLE_GIRL}, + {0x31, FACILITY_CLASS_PARASOL_LADY}, + {0x32, FACILITY_CLASS_SWIMMER_F}, + {0x33, FACILITY_CLASS_PICNICKER}, + {0x34, FACILITY_CLASS_TWINS}, + {0x35, FACILITY_CLASS_SAILOR}, + {0x38, FACILITY_CLASS_COLLECTOR}, + {0x39, FACILITY_CLASS_WALLY}, + {0x3a, FACILITY_CLASS_BRENDAN}, + {0x3b, FACILITY_CLASS_BRENDAN_2}, + {0x3c, FACILITY_CLASS_BRENDAN_3}, + {0x3d, FACILITY_CLASS_MAY}, + {0x3e, FACILITY_CLASS_MAY_2}, + {0x3f, FACILITY_CLASS_MAY_3}, + {0x40, FACILITY_CLASS_PKMN_BREEDER_M}, + {0x41, FACILITY_CLASS_POKEMON_BREEDER_F}, + {0x42, FACILITY_CLASS_PKMN_RANGER_M}, + {0x43, FACILITY_CLASS_PKMN_RANGER_F}, + {0x44, FACILITY_CLASS_MAGMA_LEADER_MAXIE}, + {0x45, FACILITY_CLASS_MAGMA_GRUNT_M}, + {0x46, FACILITY_CLASS_MAGMA_GRUNT_F}, + {0x47, FACILITY_CLASS_LASS}, + {0x48, FACILITY_CLASS_BUG_CATCHER}, + {0x49, FACILITY_CLASS_HIKER}, + {0x4a, FACILITY_CLASS_YOUNG_COUPLE}, + {0x4b, FACILITY_CLASS_OLD_COUPLE}, + {0x4c, FACILITY_CLASS_SIS_AND_BRO}, }; static const u8 *const gUnknown_085DCFD8[] = @@ -942,56 +942,56 @@ struct const u8 *const *strings; } const gUnknown_085DD500[] = { - {0x00000047, gUnknown_085DD118}, - {0x0000002b, gUnknown_085DD12C}, - {0x00000000, gUnknown_085DD140}, - {0x00000014, gUnknown_085DD154}, - {0x0000002d, gUnknown_085DD168}, - {0x00000013, gUnknown_085DD17C}, - {0x0000002f, gUnknown_085DD190}, - {0x00000043, gUnknown_085DD1A4}, - {0x00000026, gUnknown_085DD1B8}, - {0x00000015, gUnknown_085DD1CC}, - {0x0000000a, gUnknown_085DD1E0}, - {0x00000010, gUnknown_085DD1F4}, - {0x0000000c, gUnknown_085DD208}, - {0x00000042, gUnknown_085DD21C}, - {0x00000031, gUnknown_085DD230}, - {0x00000030, gUnknown_085DD244}, - {0x00000036, gUnknown_085DD258}, - {0x0000002e, gUnknown_085DD26C}, - {0x00000011, gUnknown_085DD280}, - {0x00000019, gUnknown_085DD294}, - {0x00000020, gUnknown_085DD2A8}, - {0x00000029, gUnknown_085DD2BC}, - {0x00000009, gUnknown_085DD2D0}, - {0x00000016, gUnknown_085DD2E4}, - {0x00000034, gUnknown_085DD2F8}, - {0x00000004, gUnknown_085DD30C}, - {0x00000035, gUnknown_085DD320}, - {0x00000037, gUnknown_085DD334}, - {0x0000001d, gUnknown_085DD348}, - {0x0000003a, gUnknown_085DD35C}, - {0x00000005, gUnknown_085DD370}, - {0x00000044, gUnknown_085DD384}, - {0x00000045, gUnknown_085DD398}, - {0x0000000d, gUnknown_085DD3AC}, - {0x0000000e, gUnknown_085DD3C0}, - {0x00000003, gUnknown_085DD3D4}, - {0x00000012, gUnknown_085DD3E8}, - {0x00000017, gUnknown_085DD3FC}, - {0x0000001a, gUnknown_085DD410}, - {0x0000001b, gUnknown_085DD424}, - {0x0000001c, gUnknown_085DD438}, - {0x0000001e, gUnknown_085DD44C}, - {0x0000001f, gUnknown_085DD460}, - {0x00000027, gUnknown_085DD474}, - {0x00000002, gUnknown_085DD488}, - {0x0000002a, gUnknown_085DD49C}, - {0x00000038, gUnknown_085DD4B0}, - {0x00000032, gUnknown_085DD4C4}, - {0x00000033, gUnknown_085DD4D8}, - {0x00000007, gUnknown_085DD4EC} + {FACILITY_CLASS_LASS, gUnknown_085DD118}, + {FACILITY_CLASS_YOUNGSTER, gUnknown_085DD12C}, + {FACILITY_CLASS_HIKER, gUnknown_085DD140}, + {FACILITY_CLASS_BEAUTY, gUnknown_085DD154}, + {FACILITY_CLASS_FISHERMAN, gUnknown_085DD168}, + {FACILITY_CLASS_LADY, gUnknown_085DD17C}, + {FACILITY_CLASS_CYCLING_TRIATHLETE_F, gUnknown_085DD190}, + {FACILITY_CLASS_BUG_CATCHER, gUnknown_085DD1A4}, + {FACILITY_CLASS_SCHOOL_KID_M, gUnknown_085DD1B8}, + {FACILITY_CLASS_RICH_BOY, gUnknown_085DD1CC}, + {FACILITY_CLASS_BLACK_BELT, gUnknown_085DD1E0}, + {FACILITY_CLASS_TUBER_F, gUnknown_085DD1F4}, + {FACILITY_CLASS_HEX_MANIAC, gUnknown_085DD208}, + {FACILITY_CLASS_PKMN_BREEDER_M, gUnknown_085DD21C}, + {FACILITY_CLASS_RUNNING_TRIATHLETE_F, gUnknown_085DD230}, + {FACILITY_CLASS_RUNNING_TRIATHLETE_M, gUnknown_085DD244}, + {FACILITY_CLASS_BATTLE_GIRL, gUnknown_085DD258}, + {FACILITY_CLASS_CYCLING_TRIATHLETE_M, gUnknown_085DD26C}, + {FACILITY_CLASS_TUBER_M, gUnknown_085DD280}, + {FACILITY_CLASS_GUITARIST, gUnknown_085DD294}, + {FACILITY_CLASS_GENTLEMAN, gUnknown_085DD2A8}, + {FACILITY_CLASS_POKEFAN_M, gUnknown_085DD2BC}, + {FACILITY_CLASS_EXPERT_M, gUnknown_085DD2D0}, + {FACILITY_CLASS_EXPERT_F, gUnknown_085DD2E4}, + {FACILITY_CLASS_DRAGON_TAMER, gUnknown_085DD2F8}, + {FACILITY_CLASS_BIRD_KEEPER, gUnknown_085DD30C}, + {FACILITY_CLASS_NINJA_BOY, gUnknown_085DD320}, + {FACILITY_CLASS_PARASOL_LADY, gUnknown_085DD334}, + {FACILITY_CLASS_BUG_MANIAC, gUnknown_085DD348}, + {FACILITY_CLASS_SAILOR, gUnknown_085DD35C}, + {FACILITY_CLASS_COLLECTOR, gUnknown_085DD370}, + {FACILITY_CLASS_PKMN_RANGER_M, gUnknown_085DD384}, + {FACILITY_CLASS_PKMN_RANGER_F, gUnknown_085DD398}, + {FACILITY_CLASS_AROMA_LADY, gUnknown_085DD3AC}, + {FACILITY_CLASS_RUIN_MANIAC, gUnknown_085DD3C0}, + {FACILITY_CLASS_COOLTRAINER_M, gUnknown_085DD3D4}, + {FACILITY_CLASS_COOLTRAINER_F, gUnknown_085DD3E8}, + {FACILITY_CLASS_POKEMANIAC, gUnknown_085DD3FC}, + {FACILITY_CLASS_KINDLER, gUnknown_085DD410}, + {FACILITY_CLASS_CAMPER, gUnknown_085DD424}, + {FACILITY_CLASS_PICNICKER, gUnknown_085DD438}, + {FACILITY_CLASS_PSYCHIC_M, gUnknown_085DD44C}, + {FACILITY_CLASS_PSYCHIC_F, gUnknown_085DD460}, + {FACILITY_CLASS_SCHOOL_KID_F, gUnknown_085DD474}, + {FACILITY_CLASS_POKEMON_BREEDER_F, gUnknown_085DD488}, + {FACILITY_CLASS_POKEFAN_F, gUnknown_085DD49C}, + {FACILITY_CLASS_SWIMMER_F, gUnknown_085DD4B0}, + {FACILITY_CLASS_SWIMMING_TRIATHLETE_M, gUnknown_085DD4C4}, + {FACILITY_CLASS_SWIMMING_TRIATHLETE_F, gUnknown_085DD4D8}, + {FACILITY_CLASS_SWIMMER_M, gUnknown_085DD4EC} }; static const u8 *const *const gUnknown_085DD690[] = -- cgit v1.2.3 From 2187dbb10af7ef22600ef7cbb818235556f60050 Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 10 Dec 2018 10:17:03 -0500 Subject: remove explicit array lengths from battle_tower.c --- src/battle_tower.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/battle_tower.c') diff --git a/src/battle_tower.c b/src/battle_tower.c index cb128b532..c6ec643da 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -147,7 +147,7 @@ const u16 gBattleFrontierHeldItems[] = #include "data/battle_frontier/battle_frontier_trainers.h" #include "data/battle_frontier/battle_frontier_mons.h" -const u8 gTowerMaleFacilityClasses[30] = +const u8 gTowerMaleFacilityClasses[] = { FACILITY_CLASS_RUIN_MANIAC, FACILITY_CLASS_TUBER_M, @@ -181,7 +181,7 @@ const u8 gTowerMaleFacilityClasses[30] = FACILITY_CLASS_HIKER }; -const u8 gTowerFemaleFacilityClasses[20] = +const u8 gTowerFemaleFacilityClasses[] = { FACILITY_CLASS_AROMA_LADY, FACILITY_CLASS_TUBER_F, @@ -205,7 +205,7 @@ const u8 gTowerFemaleFacilityClasses[20] = FACILITY_CLASS_LASS }; -const u8 gTowerMaleTrainerGfxIds[30] = +const u8 gTowerMaleTrainerGfxIds[] = { EVENT_OBJ_GFX_HIKER, EVENT_OBJ_GFX_TUBER_M, @@ -239,7 +239,7 @@ const u8 gTowerMaleTrainerGfxIds[30] = EVENT_OBJ_GFX_HIKER }; -const u8 gTowerFemaleTrainerGfxIds[20] = +const u8 gTowerFemaleTrainerGfxIds[] = { EVENT_OBJ_GFX_WOMAN_2, EVENT_OBJ_GFX_TUBER_F, -- cgit v1.2.3 From c8cad8a3897cbcc5034dc4566f1d4d7b335ea722 Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 10 Dec 2018 10:33:51 -0500 Subject: re-add explicit array sizes --- src/battle_tower.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/battle_tower.c') diff --git a/src/battle_tower.c b/src/battle_tower.c index c6ec643da..cb128b532 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -147,7 +147,7 @@ const u16 gBattleFrontierHeldItems[] = #include "data/battle_frontier/battle_frontier_trainers.h" #include "data/battle_frontier/battle_frontier_mons.h" -const u8 gTowerMaleFacilityClasses[] = +const u8 gTowerMaleFacilityClasses[30] = { FACILITY_CLASS_RUIN_MANIAC, FACILITY_CLASS_TUBER_M, @@ -181,7 +181,7 @@ const u8 gTowerMaleFacilityClasses[] = FACILITY_CLASS_HIKER }; -const u8 gTowerFemaleFacilityClasses[] = +const u8 gTowerFemaleFacilityClasses[20] = { FACILITY_CLASS_AROMA_LADY, FACILITY_CLASS_TUBER_F, @@ -205,7 +205,7 @@ const u8 gTowerFemaleFacilityClasses[] = FACILITY_CLASS_LASS }; -const u8 gTowerMaleTrainerGfxIds[] = +const u8 gTowerMaleTrainerGfxIds[30] = { EVENT_OBJ_GFX_HIKER, EVENT_OBJ_GFX_TUBER_M, @@ -239,7 +239,7 @@ const u8 gTowerMaleTrainerGfxIds[] = EVENT_OBJ_GFX_HIKER }; -const u8 gTowerFemaleTrainerGfxIds[] = +const u8 gTowerFemaleTrainerGfxIds[20] = { EVENT_OBJ_GFX_WOMAN_2, EVENT_OBJ_GFX_TUBER_F, -- cgit v1.2.3 From 68017b531a47bce7c125eea617a701a89013c983 Mon Sep 17 00:00:00 2001 From: Meowsy Date: Mon, 10 Dec 2018 15:49:33 -0500 Subject: Rename UnknownPokemonStruct to BattleTowerPokemon. --- src/battle_tower.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle_tower.c') diff --git a/src/battle_tower.c b/src/battle_tower.c index cb128b532..4a9e0dbc4 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -3245,7 +3245,7 @@ static void FillPartnerParty(u16 trainerId) for (i = 0; i < 2; i++) { struct EmeraldBattleTowerRecord *record = &gSaveBlock2Ptr->frontier.towerRecords[trainerId]; - struct UnknownPokemonStruct monData = record->party[gSaveBlock2Ptr->frontier.field_CB4[18 + i]]; + struct BattleTowerPokemon monData = record->party[gSaveBlock2Ptr->frontier.field_CB4[18 + i]]; StringCopy(trainerName, record->name); if (record->language == LANGUAGE_JAPANESE) { -- cgit v1.2.3